Change done exclusively to generate a merge conflict
Merge branch 'conflict-branch' of https://github.com/jmontene/tarea1-git

Conflicts:
	index.html