Work?
Merge branch 'master' of https://github.com/yeoniy/TCSS360.git

Conflicts:
	src/controller/LoginController.java