oprava merge+new test layout
Merge branch 'master' of https://github.com/yedlosh/ivelge