g02: bug fixed
g02: 解决冲突
Merge branch 'g02' of github.com:jimyuan/xmas-game into g02