slice list
detail project
修改readme.md
Merge branch 'master' of 192.168.5.102:ccf

Conflicts:
	etc/config.py
config.py