Added collision to Jammy
Merge branch 'master' of github.com:HarbingTarbl/GameJamTools

Conflicts:
	samples/Null/Core/GameState.cs
	src/Jammy/TileMap/Map.cs