test2
Merge branch 'master' into funcC

Conflicts:
	Test/bin/test/PrintClass.class
	Test/src/test/PrintClass.java