conglito
Merge remote-tracking branch 'origin/master'

Conflicts:
	Java2/src/pacote/Classe2.java