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

Conflicts:
	ServerDatabase/ServerDatabase/obj/x86/Debug/ConsoleApplication1.exe
	ServerDatabase/ServerDatabase/obj/x86/Debug/ConsoleApplication1.pdb
small fix to server
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3

Conflicts:
	ServerDatabase/ServerDatabase/obj/x86/Debug/ConsoleApplication1.exe
	ServerDatabase/ServerDatabase/obj/x86/Debug/ConsoleApplication1.pdb
	ServerDatabase/ServerDatabase/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
arg commit