Added collider
Merge branch 'master' of https://github.com/IanPudney/afterwards

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	afterwards-csharp.sln
	afterwards.sln
	afterwards.userprefs
Combined collision and fist