BRANCH 2 Teste
BRANCH TESTES
Merge branch 'testes'

Conflicts:
	teste.txt