working on game play
you can now play normally
Merge branch 'master' of https://github.com/christophwong/phase2-group-1-flashcard into gameplay
Fixed merge conflict with group so don't complain.
Conflicts:
	flashcard/app/controllers/card.rb
	flashcard/app/controllers/deck.rb
	flashcard/app/controllers/round.rb