cambio fidel
Merge branch 'master' of https://github.com/TRESGARTELECOM/nuevo

Conflicts:
	omar.txt