konfliktkommentar2 test
Merge branch 'master' of https://github.com/Grynet/Temp