player weapons n stuff
Merge branch 'upgrades'