More powerup stuff, and added XP to player
Merge branch 'master' of github.com:MaritalWheat/Jacked