提交昨晚修改
测试git
update config
Merge branch 'master' of https://github.com/colenhyt/cf
Revert "提交昨晚修改"

This reverts commit b9d216d367edeaa8ab21a47dcf933c28275da4f2.