commit on darko1 branch
Merge branch 'darko1'

Conflicts:
	src/main/java/simple/TestMain.java