bug version
Merge branch 'master' of https://github.com/wi-secret/TestGame