Update powerup types
hotfix
Merge branch 'master' of github.com:Poke-the-Game/Poke

Conflicts:
	lib/Game.js