two guns
gamepad
Merge branch 'master' of https://github.com/w84death/Project-Riese-PlusPlus

Conflicts:
	lib/game/entities/player.js