rm log
Merge branch 'master' of github.com:lvsgame/shaco
rm log