formatting in 2$ fixed
Merge branch 'master' of https://github.com/DJTedMoney/Milestone4

Conflicts:
	ServerDatabase/ServerDatabase/bin/Debug/LoginDatabase.sqlite