fixing merger conflict'
Merge branch 'master' of github.com:LaunchAcademy/coffee_filter
added test and form for review
finished review part of shops
formatted reviews
Merge branch 'master' of github.com:LaunchAcademy/coffee_filter
Fixed merge conflicts
deleted carrierwave file
finished add review branch
Merge pull request #13 from LaunchAcademy/add_reviews

RFR
Implemented test for user editing a shop
Resolving merge conflicts
Added login module
Added delete functionality