Added seeds.rb
Fixed merge conflict
Merge Issues
Merge conflict fixed