giving random weapon every 45 seconds
Merge pull request #72 from deini/dev

Now showing performance time when a player wins.
toggled modal on new game
Added basic join functionality, watch bug
Merge pull request #73 from wgester/dev

join
Refactored attacks
Merge branch 'attack2' into dev
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
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