fight
Merge branch 'master' of github.com:buddhabrot/hacktheelections

Conflicts:
	app/css/main.css
	app/js/directives/arena.directive.js
	app/less/battle.less
	app/views/battle.html