"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'
"rails g scaffold_controller Bookmark".
Remove show, new, edit and update actions from bookmarks controller.
"rails g scaffold_controller FeedItem".
Remove all actions from feed items controller and add bookmark action.
Remove all feed items views.
Add route for POSTing bookmarks.
Add bookmark button for feed show view (list of feed items).
Merge branch 'habib'
Merge branch 'master' into habib_bookmarks_controller
Make bookmarks functionality work.
Merge branch 'habib'
Merge branch 'master' into habib_bookmarks_controller
Remove create action from bookmarks controller.
Add index and destroy actions to routes for bookmarks.
Remove edit, new and show views from bookmarks, as well as form partial.
Merge branch 'colin' into habib_colins_css_changes_merge