modificado index.html
Merge branch 'master' of https://github.com/nahuelburgos/tallerGE

Conflicts:
	index.html