merge fixed
Merge pull request #9 from gongting/master

处理合并冲突