It's the final push
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Valentine's quest.apk
	Pineapple/bin/classes.dex
	Pineapple/bin/resources.ap_
	Pineapple/src/com/pineapple/valentine/GamePanel.java