fixed conflict
Merge branch 'master' of https://github.com/huip/guwen
fixed answer bugs