-
-

Merge branch 'master' of https://github.com/valcu/colorZapper

Conflicts:
	README.md