hyperlinked RSS Feed Name on index.html.erb to show the feed_items of that feed
added Subscribed Feeds section to nav
fixed merge conflict
Updated Subscriptions Nav section to use subscriptions vs feeds
Fixed Unsubscribe logic for feeds/index.hmtl.erb page
fixing the damned feed.id user.id bugs
fixed feeds controller merge conflict