删掉了重复数据
Merge remote-tracking branch 'remotes/michael/master'
Merge pull request #62 from LuckyDukang/master

删掉了重复数据