mudei o texto
Merge branch 'master' of https://github.com/tomwel/teste.git

Conflicts:
	Teste/src/main/Teste.java