update
Merge remote-tracking branch 'origin/develop' into gh-pages
Merge remote-tracking branch 'origin/develop' into gh-pages
ajuste url
Merge remote-tracking branch 'origin/develop' into gh-pages

Conflicts:
	_layouts/indice.html
	_site/index.html
index ajuste