updated styling
fixed merge conflict
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
Merge branch 'master' of github.com:habibalamin-generalassembly-wdi/feed-me
Merge branch 'colin'