quinto commit
sexto commit
Merge branch 'master' of github.com:sagi2586/PRUEBA

Conflicts:
	mitexto.txt