create seed file
Merge branch 'laney'

Conflicts:
	db/seeds.rb