Merge pull request #74 from malucky/dev

refactored attack and added skeleton for delete line
fixed css (believe it or not)
Merge pull request #75 from alexmckenley/dev

fixed css (believe it or not)
moved timers into controller scope
correctly stopping timer
Added player names
begin work on spinner (Right hand side)
Merge branch 'bugfix' into bugfixMerge

Conflicts:
	public/scripts/controllers/game.js
Reverted spinner back to normal
Merge pull request #76 from alexmckenley/dev

Timer now stop after winning
Added error to console when submit is not successful
Merge branch 'submit' into dev
Added new weapons
Merge pull request #77 from deini/dev

Added error to console when submit is not successful
Showing weapons initially
Merge branch 'cssFix' into dev

Conflicts:
	public/scripts/controllers/game.js
	public/styles/main.css