Merge branch 'master' of https://github.com/spree-girls/spree-theme-market
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market