Remove some errors
Merge branch 'master' of https://github.com/chenminglei/final_fight
Merge