testing stuff
Merge branch 'master' of https://github.com/desertplanet/COMPshop
merging