Working commit.
Merge branch 'master' of https://github.com/jesserosato/BackEnd

Conflicts:
	BackEnd/BackEnd/Controller.Designer.cs
	BackEnd/BackEnd/Controller.cs
	BackEnd/BackEnd/CreateUser.cs
	BackEnd/BackEnd/LogIn.cs