Just putting everything together because I made a mistake :)
Putting everything together
Merge remote-tracking branch 'origin/master'

Conflicts:
	Eclipse/Jumpy/bin/Jumpy.apk
	Eclipse/Jumpy/bin/classes.dex
	Eclipse/Jumpy/bin/classes/com/example/jumpy/MainActivity.class
	Eclipse/Jumpy/bin/classes/com/example/jumpy/R$id.class
	Eclipse/Jumpy/bin/classes/com/example/jumpy/R$layout.class
	Eclipse/Jumpy/bin/classes/com/example/jumpy/R$menu.class
	Eclipse/Jumpy/bin/classes/com/example/jumpy/R$string.class
	Eclipse/Jumpy/bin/classes/com/example/jumpy/R$style.class
	Eclipse/Jumpy/bin/resources.ap_
	Eclipse/Jumpy/gen/com/example/jumpy/R.java