Merge pull request #386 from ping19/master

Weapon to powerups
Merge pull request #387 from ping19/master

Repositioning