Merge pull request #3 from lunnlew/master

合并
合并错误回滚
Merge branch 'Develop' of https://github.com/lunnlew/candy into Develop
修改冲突标识文件