Trying to merge some files from the ephys rig
Merge branch 'master' of https://github.com/efferencecopy/codebase

Conflicts:
	ImageProcessing/imageAnalysisTutorial.m