Merge pull request #1 from taabi/master

Give it to me one more time
idk what this is
Updates to topics
feedView edits
Merge pull request #3 from sstehly/master

merge 2