pre merge commit
Merge branch 'master' of https://github.com/birko/MiniShop
oprava odsadenia