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

Conflicts:
	teste.txt

certo
ha
teste