commit jonas
commit jonas 2
Merge branch 'master' of https://github.com/ricairon/projetoGIT.git

Conflicts:
	workspace/projetoGIT/src/padrao/Hello.java