Merge branch 'gh-pages'
Disqus, arreglos footer, timeline
Merge branch 'master' into gh-pages