Commit 1 na branch 2
commit conflict
Merge branch 'master' into newBranchZnk
Merge branch 'newBranchZnk'

Conflicts:
	QuizLiteProject/src/com/zaniewicz/elearning/server/Runka.java