spawn short weapons
Merge branch 'master' of github.com:BattleRattle/gamejam-7

Conflicts:
	static/js/screens/GameScreen.js