update
Merge branch 'master' of https://github.com/xiangming/ColorPicker

Conflicts:
	index.html