Fixed some broken stuff with tiles.
Merge branch 'master' of github.com:MiniJam/OffTheGrid

Conflicts:
	Assets/Scenes/MainGame.unity
	Assets/Scripts/CameraManager.cs