Programmed *--- some

It's nothing too impressive.
Merge branch 'master' of https://github.com/riggtravis/rom-30_and_J

Conflicts:
	ROM-30.capx.backup1

	modified:   Assets/Kenney/Thumbs.db
	modified:   Assets/Thumbs.db
	modified:   Layouts/r14.uistate.xml
	modified:   Layouts/r14.xml
	modified:   Layouts/r15(GPS).uistate.xml
	renamed:    Layouts/r14.xml -> Layouts/r15(GPS).xml
	modified:   ROM-30.caproj
	modified:   ROM-30.uistate.xml
	modified:   Textures/JumpThruTile.png
	new file:   Textures/room13.png
	new file:   Textures/room15_GPS.png