seeds.rb updated
Merge branch 'master' of github.com:RaffiHsieh/410project
fixed conflict