fake data from feed displaying
adding fake feed to show
fixed merge conflict in partial view
moved indentation
Merge pull request #29 from rmoshier/rlm-thursday

Rlm thursday