power ups added
Merge branch 'powerup'

Conflicts:
	yolo-octo-dubstep.userprefs