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

Feed
Added profile picture to profile page
Merge pull request #21 from ashag/omniauth

Omniauth looks good
refactor tumblr formatting
Merge branch 'master' into tumblr
tumblr posts rending