Nothing of note
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-
Score adjusted from Server. Movement updates sent out every 40 ms
Nothing of note
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	Assets/Login.unity
	Assets/code/GameProcess.cs
	Assets/code/Player.cs
	Assets/code/Sockets.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/metadata/16/16993237ab83a064f8ad0f0258298796
	Library/metadata/4c/4ce14ec42a8865e4d881fc194554771f
	SwarchServer/SwarchServer.v11.suo
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.exe
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.pdb
	SwarchServer/SwarchServer/bin/Debug/UserDatabase.db
Re-added delayed movement update
Re-added player movement delay for reals this time.