sample seeds file working
Merge branch 'master' of https://github.com/danapczynski/group_flashcards

Conflicts:
	app/helpers/helper.rb
	app/models/deck.rb
	app/models/round.rb
	db/seeds.rb