Fix merge conflict from origin master.
Refactoring.
Move methods to check if user is subscribed to feed to application helpers module.
Remove all references to current_user in views and replace with custom helper methods.
Merge branch 'colin'
Pull from master and resolve merge conflicts.
Merge branch 'colin'
Merge branch 'colin'
Fix bookmarks page showing bookmarks for all users.
Updated Bookmarks with FontAwesome
deleted feeds/index.html.erb
Remove feeds index page from routes.
Fix if condition to check if user is browsing their own subscriptions page to hide private subs.
Merge branch 'master' into habib
Updated Bookmarks/index page
Merge branch 'colin'
"rails g model Archive user:references feed_item:references", then "rake db:migrate".
Merge branch 'master' of github.com:habibalamin-generalassembly-wdi/feed-me