settings
Merge branch 'develop' of https://github.com/crookedbonsai/Mahjong