I think I was just trying to fix room 12

We might be moving to a large map, so we're going to branch the github
and do two seperate code bases, and then pick which one to go with.
Merge branch 'master' of https://github.com/riggtravis/rom-30_and_J

Conflicts:
	Layouts/room-12.uistate.xml
	ROM-30.capx.backup1

	modified:   Assets/Kenney/Base pack/Tiles/Thumbs.db
	modified:   Event sheets/ROMplay.uistate.xml
	modified:   Event sheets/level 12.xml
	modified:   Event sheets/r13.xml
	modified:   Layouts/room-12.uistate.xml
	modified:   Layouts/room-12.xml
	modified:   ROM-30.uistate.xml