conflict
Merge branch 'master' of github.com:Bcoan/teste

Conflicts:
	Teste.java