tom stuff
more tom stuff
Merge branch 'master' of https://github.com/countspatula/GeometryArena

Conflicts:
	rectangle/Assembly-CSharp-vs.csproj
	rectangle/Assembly-CSharp.csproj
	rectangle/Assets/Prefab.meta
	rectangle/Assets/Scene.meta
	rectangle/rectangle-csharp.sln
	rectangle/rectangle.sln