updated feeds.rake file
updated show.html and feeds.rake
updated seeds.rb
modified feed.rb to parse image tags. Modified  users/show.html.haml to display images and limit text on summary.
resolved merge conflicts