shop system update
merge from old, could be bad
Merge branch 'master' of github.com:BJarv/UrsaMajor