some powerup stuff
more power, more up
Merge remote-tracking branch 'origin' into powerup-polish
power up size fix
application of powerups
showing adrenaline
Merge pull request #36 from 5-second-rule/powerup-polish

Powerup polish
Merge pull request #37 from 5-second-rule/ui-adrenaline

Ui adrenaline
Merge remote-tracking branch 'origin/master' into more-camera

Conflicts:
	game-core/Player.h