updated class flashcard. check parser method.
Fixed, merge conflict that was happening

Merge remote-tracking branch 'origin/wendy'

Conflicts:
	flashcard.rb