aa
HGNBN
a
a
Merge branch 'branch'

Conflicts:
	JavaProject/bin/packages/TesteClass.class
	JavaProject/src/packages/TesteClass.java