hmmm
deleted this weird folder
Weird merge things
Merge remote-tracking branch 'origin/master'

Conflicts:
	quickShow/PiezoSquareWave/PiezoSquareWaveAverage.m