added stuff to shop as well as functionality
Merge branch 'master' of github.com:K3NN37H/FlyingCarrots