Minor fixing in levels
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes.dex
Update
Made level 6 (without enemies for now)
Change y-position for dash dust
Fixed bug: no falling trough ground/plattform while high speedy
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes.dex
	Pineapple/bin/resources.ap_
Added enemies to level 6
Level 7 complete
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes.dex
	Pineapple/bin/resources.ap_
Fix bug: bullet travel with start speed equal to protagonists speed
Change time back to double
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes.dex
	Pineapple/bin/resources.ap_
Added level buttons 6 and 7