merge
Merge branch 'master' of https://github.com/BobLoblawsLawBomb/edbv

Conflicts:
	colorClassification.m
	test_tableSmoothing.m