fix merge conflicts Merge branch 'master' of https://github.com/znagler/flashforward into refactor_fight
fix merge conflicts
Merge branch 'master' of https://github.com/znagler/flashforward into refactor_fight

Conflicts:
	app/assets/javascripts/fight.js

znagler/rainbow-cannon-academy,znagler/rainbow-cannon-academy