empty feed message on the feeds_path
settled merge conflict on feed/show.html.erb
Merge pull request #41 from schbetsy/feed_empty_message

Feed empty message