From 1ca37367577b6bead25ada618e4595165dc686c3 Mon Sep 17 00:00:00 2001
From: David Paquette <david@clearstak.com>
Date: Mon, 27 Apr 2015 20:16:02 -0400
Subject: [PATCH] just kidding on the last commit

---
 src/InputOutput/UserLogin.java | 4 ++--
 src/server/server.java         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java
index 31fec46..c7dcfe3 100644
--- a/src/InputOutput/UserLogin.java
+++ b/src/InputOutput/UserLogin.java
@@ -61,7 +61,7 @@ public void handle(ActionEvent e) {
 				String queriedPassword = null;
 				try {
 					queriedEmail = _server.getUserFromEmail(enteredEmail).get("email");
-					queriedPassword = _server.getUserFromEmail(enteredPassword).get("password");
+					queriedPassword = _server.getUserFromEmail(enteredEmail).get("password");
 				} catch(Exception e1){
 					e1.printStackTrace();
 					System.out.println("ERROR: user and password does not exist");
@@ -73,7 +73,7 @@ public void handle(ActionEvent e) {
 				if (enteredEmail.equals(queriedEmail) && enteredPassword.equals(queriedPassword)){
         				_loggedin = true;
         				try{//opens new window when login true
-        					Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/SetupThermo.fxml"));
+        					Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/Thermocontroller.fxml"));
         					Stage stage = new Stage();
         					stage.setScene(new Scene(root));
         					stage.show();
diff --git a/src/server/server.java b/src/server/server.java
index b800323..fa0c424 100644
--- a/src/server/server.java
+++ b/src/server/server.java
@@ -65,7 +65,6 @@ public boolean createThermostat(String serialnumber, String name, String ip, Str
 	}
 
 	public Hashtable<String, String> getUserFromEmail(String email) {
-        dataStorage.printStruct();
 		return dataStorage.getObjectFromTableAndKey("UserTable", email);
 	}