removed comment
Merge pull request #5 from Pwalker86/Pwalker86-phil/editing_drinks

Pwalker86 phil/editing drinks
adds reviews
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee

Conflicts:
	app/views/shops/_drinks.html.erb
	app/views/shops/index.html.erb
	app/views/shops/show.html.erb
Fixs reviews controller and add form review partial
Fixs nav bar and cleaning, adds jqueryturbolinks  to fix any problems that might happen with turbolinks
Adds authenticate_user for drinks, reviews and shops
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Adds avatar to review
side bar for coffees on each cafe, show page for coffee and modal for reviews
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Fixing user page
fixing nav bar
adding addtional grit to main page
Adds edit and update to reviews and adds new fetures to user show
centered pages
adding centering
added more readability to style sheet
adding more spacing and styling
fixed merge conflicts