modifique kkkkkkk
Merge branch 'master' of https://github.com/GOG1991/tres

Conflicts:
	c.txt