PA
Merge branch 'master' of https://github.com/Project-THOR/Project-Thor

Conflicts:
	.gitignore
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/cse360project/ForgotPassword.fxml
	src/cse360project/ForgotPasswordScreenController.java
	src/cse360project/LoginScreenController.java
	src/cse360project/MainScreenController.java
	src/cse360project/NewUser.fxml
	src/cse360project/NewUserScreenController.java
Merge branch 'master' of https://github.com/Project-THOR/Project-Thor

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml