Added seeds.rb
Fixed merge conflict