modificado
Merge branch 'juank'

Conflicts:
	folder/index.html