create new branch (kimbugs)
test kimbugs
Merge remote-tracking branch 'origin/kimbugs' into zmzment+leesoom

Conflicts:
	test/src/TestMain.java