Showing weapons initially
Added player names
Added new weapons
Showing weapons initially
Merge branch 'cssFix' into dev

Conflicts:
	public/scripts/controllers/game.js
	public/styles/main.css
Merge pull request #80 from malucky/dev

Added prompting for names