Merge pull request #46 from znagler/flashcard_animations

Flashcard animations
added in a roundComplete property to the carddeck and used it in the cardsLeftInRound method to handle the case where there are zero cards left in the current round
fix merge conflicts
Merge pull request #47 from znagler/boss_grow_bug_fix

added in a roundComplete property to the carddeck and used it in the car...
Fix the double-ship bug appearing in the beginning of level 1
made aliens never touch ship
Merge pull request #48 from znagler/double_ship_bug_fix

Fix the double-ship bug appearing in the beginning of level 1
changed javascript file required from view and eliminated old dependencies
fixed merge conflicts
Merge pull request #49 from znagler/small_alien_behavior

Small alien behavior
prep for new background, changed upgrade text to green
Merge branch 'master' of https://github.com/znagler/flashforward into flashcard_animations
checking for upstream changes
ability to skip intro cutscenes