Teste
Novo teste
Teste 3
Merge branch 'master' of https://github.com/ivomoreirati/PAS

Conflicts:
	SorveteDecorator/src/Teste.java