opencvLearning
Merge branch 'master' of github.com:Windman/ImageProcessor

Conflicts:
	ImageProcessor.sln