HASHING
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git

Conflicts:
	DesignProject/src/com/designproject/controllers/LoginScreen.java
	DesignProject/src/com/designproject/controllers/SettingsController.java