update storage of powerups
Merge branch 'master' of https://github.com/MultiHopHop/ProjectGame

Conflicts:
	bin/classes/com/badlogic/androidgames/mygame/Player.class
	bin/classes/com/badlogic/androidgames/mygame/World.class
	src/com/badlogic/androidgames/mygame/Player.java
	src/com/badlogic/androidgames/mygame/World.java