player animates in on flashcard load, upgrades are visible in text animation
Merge branch 'master' of https://github.com/znagler/flashforward
player upgrade bullets fire from center, merged in flashcard animations
Conflicts:
	app/assets/javascripts/fight.js
	app/assets/javascripts/flashcard.js
	app/assets/javascripts/flashcard_ui.js
Merge pull request #46 from znagler/flashcard_animations

Flashcard animations
fix merge conflicts