small changes to seed file, switching to the correct branch
fixed merge conflic in seeds.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development