Merge branch 'Pwalker86-phil/editing_drinks'
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
adding a modal for drinks
Can add drinks via a modal.
moved partial displaying drink reivews to the reviews folder.
redirect back to drink after adding a new review instead of shops index.
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
merge conflict
removed old "add drink" and "back" buttons.
Merge pull request #6 from Pwalker86/phil/add_drink_modal

Phil/add drink modal