Merge pull request #38 from znagler/refactor_fight

Refactor fight
removed all text fields in the flashcard portion of the view
remove keyboard listeners
remove duplicate health for player
remove overallUI references in fight hs
boss alien cannot leave game area
boss alien does not shoot after she is killed
throw the aliens towards the player once they hi the scatter line
finish fight js refactor
fix merge conflicts
Merge branch 'master' of https://github.com/znagler/flashforward into refactor_fight

Conflicts:
	app/assets/javascripts/fight.js
wip