fix merge
Merge branch 'master' of github.com:eurushibata/teste

Conflicts:
	teste.txt