commit
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/src/com/cavalier/controlloers/LoginController.java