small change...
merge for colorMerge...

Merge branch 'master' of https://github.com/efferencecopy/codebase

Conflicts:
	ImageProcessing/colorMerge.m
mods to image processing routines