modificado desde clone1.1
modificado desde el clon1.2
agregado desde clone1.1
Merge branch 'master' of /home/nahuelburgos/taller_git/clone1

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'

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