Added vim attack
Added emacs
Merge branch 'attack' into dev

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

Added weapons