made bullet shoot on correct answer
Merge branch 'master' of https://github.com/znagler/flashforward into additional_flashcard_state_features
made prelim input timer
begin repair on input timer glitch
added code to flashcard update to prevent input word glitch
improved layout for text
logo screen and level intro fade on load
Merge branch 'master' of https://github.com/znagler/flashforward into welcome_animation
check for potential upstream merge conflicts
Merge pull request #42 from znagler/welcome_animation

Welcome animation
google font added
fixed merge conflict
Merge pull request #43 from znagler/additional_flashcard_state_features

Additional flashcard state features
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