fix bugs
Merge branch 'master' of github.com:renbing/battle

merge is necessary,