Some changes... (no pun intended)
Merge branch 'master' of github.com:mrthunderfield/social-feed