add55555
Merge branch 'master' of https://github.com/CarlosHRG/testingGit

Conflicts:
	testText1.txt

correccion