Work on controller/views/routes for favorites/unfavorites
Work on favorites/unfavorites
Fixed merge conflicts
completed fav/unfav