I have changed apparently

I don't even know what they are.
Merge branch 'master' of https://github.com/riggtravis/rom-30_and_J

Conflicts:
	Event sheets/ROMplay.xml
	ROM-30.caproj
	ROM-30.capx.backup1

	modified:   Animations/J/Boogie/000.png
	modified:   Animations/J/InAir/000.png
	modified:   Animations/J/InAir/001.png
	modified:   Animations/J/Jump/000.png
	modified:   Animations/J/Pickup/000.png
	modified:   Animations/J/Run/000.png
	modified:   Animations/J/Run/001.png
	modified:   Animations/J/butts/000.png
	modified:   Animations/J/stand/000.png
	new file:   Animations/Unfilled_Gem/Default/000.png
	modified:   Assets/Kenney/Base pack/Enemies/Thumbs.db
	modified:   Assets/Kenney/Base pack/HUD/Thumbs.db
	modified:   Assets/Kenney/Base pack/Player/Thumbs.db
	modified:   Assets/Kenney/Base pack/Tiles/Thumbs.db
	new file:   Assets/jumpland.wav
	new file:   Assets/pop.ogg
	new file:   Assets/sounds_2/button1.ogg
	new file:   Assets/sounds_2/button2.ogg
	new file:   Assets/sounds_2/complete.ogg
	new file:   Assets/sounds_2/off.ogg
	new file:   Assets/sounds_2/on.ogg
	modified:   Event sheets/EOG.xml
	modified:   Event sheets/Jplay.uistate.xml
	modified:   Event sheets/Jplay.xml
	modified:   Event sheets/ROMplay.xml
	modified:   Event sheets/Select.xml
	modified:   Event sheets/Start.uistate.xml
	modified:   Event sheets/Start.xml
	modified:   Event sheets/room-13 (start).xml
	modified:   Event sheets/room-15 (GPS).xml
	new file:   Files/08_-_Delusional_Lies_0.ogg
	new file:   Files/getruby.m4a
	new file:   Files/getruby.ogg
	new file:   Files/getruby.wav
	new file:   Files/jumpland.m4a
	new file:   Files/jumpland.ogg
	new file:   Files/jumpland.wav
	new file:   Files/off.ogg
	new file:   Files/on.ogg
	new file:   Files/pop.ogg
	new file:   Files/stone01.ogg
	modified:   Layouts/Credits.uistate.xml
	modified:   Layouts/Credits.xml
	modified:   Layouts/Select.uistate.xml
	modified:   Layouts/Select.xml
	modified:   Layouts/room-1 (r).xml
	modified:   Layouts/room-10 (Datasheet).uistate.xml
	modified:   Layouts/room-12.xml
	modified:   Layouts/room-13 (start) (Jplay).uistate.xml
	modified:   Layouts/room-13 (start) (Jplay).xml
	modified:   Layouts/room-13 (start) (ROM-30).xml
	modified:   Layouts/room-15 (GPS).xml
	modified:   Layouts/room-7.xml
	modified:   ROM-30.caproj
	modified:   ROM-30.uistate.xml
Modified to make sure that my head doesn't detatch.