Raul agregado en index.html
Merge branch 'devel' of https://github.com/jjavierg/curso-de-git into devel

Conflicts:
	index.html
Merge branch 'devel' of https://github.com/jjavierg/curso-de-git into devel
commit raul
Merge branch 'devel' of https://github.com/jjavierg/curso-de-git into devel