Finished the database
Merge branch 'master' of https://github.com/joester/ICS168Swarch

Conflicts:
	SwarchServer/SwarchServer/Program.cs
	SwarchServer/SwarchServer/Server.cs
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.exe
	SwarchServer/SwarchServer/obj/Debug/SwarchServer.exe