Implemented Shop items
Merge pull request #8 from suchintan/Hazikbranch

Hazikbranch
Fixed merge problems