"rails g model Bookmark user:references feed_item:references", then "rake db:migrate".
User and FeedItem both have many each other through Bookmark.
Change user and feed_item has_many through association names from feed_items and users to bookmarked and bookmarked.
Merge branch 'habib'