Commit test Darko 1
Merge branch 'master' of ssh://git@github.com/eicher2/testgit.git

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