Modified from cfloresm@anzen.com.mx
	modified:   master.txt from master managament
Merge branch 'master' of github.com:cfloresm/TesGit

Conflicts:
	FolderMaster/master.txt
	modified:   master.txt