reworked powerups
merge conflict
Merge branch 'master' of https://github.com/danielduan/CodeBattle