Add paper clip, adds zipcode and gender to devise
Merge pull request #2 from Pwalker86/phil/ReadME

Added login info to Read Me
Filled out drinks_controller
Added drinks to the shops_controllers
Views for creating new drinks and displaying them in the shops.
fixing gem issue
adds name, zipcode and avatar to user
fix merge conflict
Remove duplicate migration :(
added views for edit index and show for shops
fixed edit
Merge pull request #3 from Pwalker86/phil/drinks_controller_and_views

Phil/drinks controller and views
fixed edit for cafe
changed show and fixed merge conflicts
added link_to target function and helper
changed helper name for improved readability
added sticky nav bar with re-sizing
Working on editing drinks
Merging changes from master
Fixed editing of drinks.