fixed merge conflict
Merge branch 'master' of github.com:ericirel/fellow_shop
Merge branch 'master' of github.com:ericirel/fellow_shop
Merge branch 'master' of github.com:ericirel/fellow_shop
Merge branch 'master' of github.com:ericirel/fellow_shop
added seed
fixed merge conflict