test konfliktu
Merge branch 'master' of https://github.com/murbans1/testgit