feature2 commit
Merge branch 'feature2'

Conflicts:
	TestProject/src/pkg/Main.java