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.