Teste
Merge branch 'master' of https://github.com/ericlemes/tests

Conflicts:
	teste.txt