fixed merge conflict
Merge branch 'master' of github.com:ericirel/fellow_shop
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
profile views, edit profile
Merge branch 'master' of github.com:ericirel/fellow_shop