sortiment changes
Merge branch 'master' of https://github.com/smartasystem/splendor
sortiment more changes