Bugfix
Merge branch 'master' of https://github.com/brmahska/shop-repo.git