有修改??
测试
Merge branch 'master' of https://github.com/xiongdan506/color.js

Conflicts:
	LICENSE.md