配置文件更改
Merge branch 'master' of https://github.com/iamaddy/kankan