Remove @tweet iteration
Fixed merge conflict
Fix merge conflicts
Merge pull request #22 from crystalperreira/fixfeed

Fixfeed