Merge branch 'master' of https://github.com/Olga-Zuravlova/megamarket.git