TODO added
Merge branch 'varo1012' of https://github.com/pada1015/shop-repo.git into varo1012