Merge pull request #11 from cflores/master

	modified:   master.txt
Merge pull request #12 from cflores/master

Update README.md
Update PruebaArchivo.txt
Update PruebaArchivo.txt
Modified file for test
Add text
Merge pull request #13 from gitAlexAnzen/testBranch

Modified file for test
Add text rama
Merge branch 'branchOK' of github.com:gitAlexAnzen/TesGit into gitAlexAnzen-branchOK

Conflicts:
	PruebaArchivo.txt
Merge branch 'gitAlexAnzen-branchOK'
Cambio en master
Cambio dos en pluma
Add cambio master
Add file from fork branch .
Merge pull request #15 from gitAlexAnzen/master

Change in file
Modification from fork .wq