Merge branches 'gh-pages' and 'gh-pages' of github.com:gnpfonseca/newsfeed into gh-pages