!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data_Processing/cuttingSignal.asv
	Data_Processing/cuttingSignal.m
	Data_Processing/cuttingSignalAlt.asv