Merge pull request #15 from taabi/master

Pulling Tabish's Updates to FeedView
Merge pull request #16 from taabi/sstehly-master

Merge pull request #15 from taabi/master