some more work on fixing the way html chunks are displayed
resolving merge conflict
resolves merge conflicts
refactored content for twitter_feed into html"
fixes html in twitter_feed
Merge pull request #20 from ashag/feed

Feed