Signed-off-by: mori <kotaro@kotaro-PC.(none)>
Merge branch 'master' of https://github.com/MahjongGroup/MahjongJava.git

Conflicts:
	src/system/hai/HaiType.java

Signed-off-by: mori <kotaro@kotaro-PC.(none)>