解决冲突
Merge pull request #3 from kenticny/master

合并