amp and freq changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	research/echos/echoGen.m