retrievePixelIntensityOperation
q
gitign
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	BeadsProcessing/BeadIdentificationOperation.cpp
	BeadsProcessing/BeadProcessingFactory.cpp
	BeadsProcessing/BeadsProcessing.h
	BeadsProcessing/Release/BeadsProcessing.dll.intermediate.manifest