Added test to verify that user is logged in in order to add a coffee shop.
Created association between user and shop.
Code cleanup
Removed whitespace.
Merged master with assocate_shop_with_user and resolved schema merge conflicts.
Fixed build error for users and shops.
Added shop and user association
Implemented test for user editing a shop
Resolving merge conflicts
Added login module
Added delete functionality
Merge pull request #14 from LaunchAcademy/associate_shop_with_user

WIP - Associate shop with user