additional changes to seeds.rb
fixed merge conflict in seeds.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development