Working on no air jump
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes.dex
	Pineapple/src/com/example/pineapple/GamePanel.java
	Pineapple/src/com/example/pineapple/Protagonist.java