The modified shop, including a Category feature
Merge branch 'master' of https://github.com/SFighterPilot/shop25.git