added seeds
fixed conflicts

Merge branch 'justin-tyler'

Conflicts:
	source/flashcards/db/seeds.rb