connectString
Merge branch 'origin/RikBranch'

Conflicts:
	server/Server 2.0/bin/Debug/Server 2.0.exe
	server/Server 2.0/bin/Debug/Server 2.0.pdb
	server/Server 2.0/bin/Debug/db/oopDB.mdf
	server/Server 2.0/bin/Debug/db/oopDB_log.ldf
	server/Server 2.0/obj/Debug/Server 2.0.csprojResolveAssemblyReference.cache
	server/Server 2.0/obj/Debug/Server 2.0.exe
	server/Server 2.0/obj/Debug/Server 2.0.pdb