Fix feeds controller to use new user_id and feed)id attributes (instead of user and feed).
fixed feeds controller merge conflict
Fix subscribing to a feed that doesn't yet exist in the db.
updated styling
fixed merge conflict
Fix spelling mistake which was making subscription button break.
Merge branch 'master' of github.com:habibalamin-generalassembly-wdi/feed-me
updated show.html.erb to replicate index.html.erb and removed cruft from feeds_controller