fix, names, and update
Merge branch 'develop' of github.com:Apercu/Warhammer into develop

Conflicts:
	css/style.css
	js/controllers/game.js