Cambio 1

Conflicts:
	README2.txt