0918_1731

test
Merge branch 'master' of https://github.com/A-Wagatsuma/mahjong

Conflicts:
	mahjong.py
before merge
0925_1330

mahjongのver.up他