modified:   master.txt
Merge branch 'master' of github.com:cfloresm/TesGit

Conflicts:
	FolderMaster/master.txt
	modified:   master.txt
Update README.md
Merge pull request #11 from cflores/master

	modified:   master.txt