changed something small
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3
minor changes
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3

Conflicts:
	ServerDatabase/ServerDatabase.suo
trying to pull
Client Side networking almost done, just need threading for read/writes (Nathan v2.0)
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3

Conflicts:
	ServerDatabase/ServerDatabase.suo
	ServerDatabase/ServerDatabase/obj/x86/Debug/ServerDatabase.csproj.FileListAbsolute.txt