just for remove the conflict in save data
Merge branch 'master' of github.com:lshy1993/lucky_game
history finish