Merge remote-tracking branch 'origin/zkouskaControleru'
Merge branch 'zkouskaControleru'