Mas recursos.
Mas detalle al crear el repositorio en github.
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	index.html
Merge branch 'master' into gh-pages
Show what we are going to do
Merge branch 'gh-pages' of github.com:gabelula/mi-app-datos-presentacion into gh-pages
Merge branch 'gh-pages'