done
Merge branch 'master' of https://github.com/SickAcorn/P4

Conflicts:
	bin/CompanyHierarchyMain.class