marker logos added
removed cafe_users and replaced with favorite_cafes model. current_user can now add/remove favorites and @faves is now an instance variable available from the cafe index method as an array of the current_user's favorite cafes.
sorted conflict with scheme - Dom's was latest version to include new image uploader.
updating favorite links on cafe show page
Dave and I merge over cafe show page
name of cafe shows on map when logo is clicked
conflicts resolved
Merge branch 'development' of github.com:domhacking/project_2_wifinder into development
Merge branch 'master' into development
Merge branch 'card-37' into development
fav/unfav links now show depending on whether current_user has the vafe as a fav or not
Merge branch 'development' of github.com:domhacking/project_2_wifinder into card19c
cafes has many photos
Merge branch 'development' of github.com:domhacking/project_2_wifinder into card-28