made shops work completly
Merge branch 'master' of https://github.com/meet-projects/shooksookbytes-y2-2013