merge

Description: Sumwun Speshal. git.
Commit: Christopher
Merge branch 'Develop' of https://github.com/CodingCo/3SemLoginServer into Develop

Conflicts:
	build/test/classes/facadeTests/UserFacadeInterfaceTest.class
	src/facades/UserFacade.java