修改默认的示例程序皮肤
Merge branch 'master' of https://github.com/lunnlew/candy
Merge pull request #1 from lunnlew/Develop

修改 Admin
提交
删除冲突文件
update
Merge remote-tracking branch 'origin/Develop'
更新文件
merge
Merge pull request #3 from lunnlew/master

合并