carga y diseño de contenido
Merge branch 'gh-pages' of https://github.com/rodbustamante/rbustamante into gh-pages

Conflicts:
	index.html