update
revision urls
revisión problemas
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	_site/index.html
	index.md
Merge remote-tracking branch 'origin/develop' into gh-pages