shop works for both players
Merge branch 'master' into megan2
Merge branch 'master' into aircraft