Update
Merge branch 'master' of https://github.com/joester/ICS168Swarch

Conflicts:
	NEWER server code/SwarchServer/SwarchServer/bin/Debug/SwarchDatabase.db
	NEWER server code/SwarchServer/SwarchServer/bin/Debug/SwarchServer.exe
	NEWER server code/SwarchServer/SwarchServer/obj/Debug/SwarchServer.exe