编辑1
Merge branch 'master' of https://github.com/ccwq/clib

Conflicts:
	readme.txt
制造差异