Update flashcards.rb
Update flashcards.rb

Updated GameMaster class.
Merge branch 'n_gamemaster_branch'

Conflicts:
	flashcards.rb