Cambio de John 1
Merge branch 'featureA' of D:\repositoriosGit\pruebas\central into featureA

Conflicts:
	index.html.txt