Finished Collision Detection
Merge branch 'master' of https://github.com/13loodySword/Swarch

Conflicts:
	Server/Server/Phagocyte.cs
	Server/Server/Server.cs
	Server/Server/bin/Debug/Server.exe
	Server/Server/bin/Debug/Server.pdb
	Server/Server/obj/x86/Debug/Server.exe
	Server/Server/obj/x86/Debug/Server.pdb
	Swarch/Library/ScriptAssemblies/Assembly-CSharp.dll
	Swarch/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Swarch/Library/assetDatabase3
	Swarch/Library/metadata/62/626747300b7534d48a8b1d390643a1b4
	Swarch/Library/metadata/7d/7d6eb67ab23fc214abedaf94bde07a03
	Swarch/Library/metadata/bb/bb3994a01693b1347b40a52efe61b55c