Change made
Merge branch 'master' of https://github.com/jcsalaza/fill_in_the_flash into model_and_csv

Conflicts:
	decks.rb
Add card return
Merge pull request #7 from jcsalaza/model_and_csv

Model and csv