upgrade players gun
grow boss based on questions correct
alien grows in flashcard state - a function of gameState.questionsCorrect
fixing merge conflicts
Merge branch 'master' of https://github.com/znagler/flashforward into upgrades

Conflicts:
	app/assets/javascripts/fight.js
merging branches
Merge branch 'master' of https://github.com/znagler/flashforward into upgrades

Conflicts:
	app/assets/javascripts/flashcard.js
	app/assets/javascripts/flashcard_ui.js
Merge pull request #45 from znagler/upgrades

Upgrades