teste de commit issue #3
Merge remote-tracking branch 'origin/tst-d-merg'

Conflicts:
	Arquivo Tuily.txt
Merge branch 'master' of https://github.com/LucaasHoffmann/Veloh