MBP version while editing simultaneously on Nuke. oops.
Merge branch 'master' of https://github.com/efferencecopy/codebase

Conflicts:
	HorwitzLab/Charlie/DTretina/coneNoiseAnalysis.m