temp commit
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3

Conflicts:
	ServerDatabase/ServerDatabase.suo
das commit
minor changes