I fixed the thing maybe

But Cody Commited things. Oh god. Here it comes.
Merge branch 'master' of https://github.com/riggtravis/rom-30_and_J

Conflicts:
	Event sheets/ROMplay.xml
	Layouts/j14.xml
	Layouts/j15(GPS).xml
	ROM-30.caproj
	ROM-30.capx.backup1
	ROM-30.uistate.xml

	modified:   Event sheets/ROMplay.uistate.xml
	modified:   Event sheets/ROMplay.xml
	modified:   Event sheets/j13.xml
	modified:   Event sheets/j15.xml
	modified:   Layouts/Select.uistate.xml
	modified:   Layouts/Select.xml
	deleted:    Layouts/j14.uistate.xml
	deleted:    Layouts/j15(GPS).uistate.xml
	modified:   ROM-30.caproj
	modified:   ROM-30.uistate.xml