Committing the new gitignore to also ignore obj/
Merge branch 'Collisions' of https://github.com/cplepel/GameJam into Collisions
VERSION CONTROL IS AWFUL.  FUCKING BRINSON.
Merge branch 'Collisions' into Develop

Conflicts:
	.gitignore
	GameJamGit-csharp.sln
	GameJamGit.sln