fixing error in merghing iwth shop
Merge branch 'master' of github.com:K3NN37H/FlyingCarrots
fixed errors and made map dissapear