修改bug
Merge branch 'master' of https://github.com/2014-2/001.git