Added vim attack
Console is now printing errors
Added emacs
Merge branch 'attack' into dev

Conflicts:
	public/scripts/controllers/game.js
Merge pull request #69 from malucky/dev

Added weapons
Merge branch 'console' into dev
Merge pull request #71 from deini/dev

Console is now printing errors
giving random weapon every 45 seconds
Now showing performance time when a player wins.
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)