Cambio Rama Test
Merge branch 'Test' of github.com:cflores/TesGit into cflores-Test

Conflicts:
	PruebaArchivo.txt
Merge branch 'cflores-Test' into rama2