Merge branch 'gh-pages'
Merge branch 'gh-pages'

Conflicts:
	archive.html
	articles/another-test/index.html
	articles/bamboo-cutter/index.html
	articles/hello-world/index.html
	articles/markdown-syntax/index.html
	articles/red-herring/index.html
	index.html
	page/2/index.html
copia de gp-pages
Merge branch 'master' into gh-pages