resolve conflict
Merge branch 'master' of https://github.com/tomii6614/mahjong
retry #15
retry #16
Merge pull request #19 from majiang/master

Resolve conflict