update
Merge branch 'gh-pages' of https://github.com/gnpfonseca/newsfeed into gh-pages