clobbered assets
clicking logo takes you to root path
Merge branch 'master' of github.com:jasonleibowitz/moker_app
updated ERD to reflect connection between user and coffee shops
Merge branch 'development' of github.com:jasonleibowitz/moker_app into development
Merge branch 'master' of github.com:jasonleibowitz/moker_app
Merge branch 'development'
Delete application.yml
Merge branch 'master' of github.com:jasonleibowitz/moker_app