Fixed merge conflicts
Merge pull request #34 from bayendor/more_shop

Fixed merge conflicts