Conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test2/bin/Test2.class
	Test2/src/Test2.java