comiit
Merge branch 'master' of https://github.com/titohazin/Teste5.git

Conflicts:
	Teste5/src/Teste5.java