Showing weapons initially
Added player names
Added new weapons
Showing weapons initially
fixed div covering textbox
Merge pull request #78 from wgester/dev

set default
Merge branch 'covers' into dev
removed redundant 'divs'
Merge pull request #79 from alexmckenley/dev

small bugfixed
Merge branch 'cssFix' into dev

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

Added prompting for names
Fixed repeated weapons problem.
Repopulate available weapons when it runs out
Merge branch 'dev' into finalRevisions
Implemented freezing and hide_self
Added attack messages
refactored sandbox to sync.
fixed timeout error issue
Merge branch 'covers' into dev