#2323 colorMatrix
Merge branch 'master' of https://github.com/JulianProfas/kb50

Conflicts:
	I spy/I spy/Color.m