Trying to fix Nick's directory
Merge branch 'master' of https://github.com/nmitrou/Phase_detectors

Conflicts:
	Matlab/Phase_detectors_compare_run.m
	Matlab/hilbert_interp.m
	Matlab/wavelet_interp.m

I don't understand
x