work work
fix conflicts
fix conflicts
Merge branch 'master' of https://github.com/penguinscontrol/Spike2Scripts

Conflicts:
	plot_mahalanobis.asv
	plot_mahalanobis.m