changin feed-content
Merge branch 'master' of git://github.com/CondeNast/pangea
merging style changes