System.out.println("test main") x 5
Merge remote-tracking branch 'origin/zmzment+leesoom' into app

Conflicts:
	test/src/TestMain.java