update
update
update
update
Merge branch 'pr/5'

Conflicts:
	README.md
Merge pull request #6 from hzlzh/master

add colorsnapper