created specs for feed
feed rspec
rspec is working
merge conflicts
whitespace
image_tag correction
merge rspec conflicts with master
fixed merge conflicts