Move along, nothing to see here.
Merge branch 'Optickle2-jm' of github.com:Optickle/Optickle into Optickle2-jm

Conflicts:
	debug/temp.mat
Merge branch 'Optickle2-m3v4n5' into Optickle2-jm
Removed treatment of unconnected inputs (for quantum noise) from getNoiseMatrix. This is now treated in convertOpticsAC.
Merge branch 'Optickle2-m3v4n5' into Optickle2-jm
changed squeezer.m input variables
"backup save"
Merge branch 'Optickle2-m3v4n5' of git://github.com/Optickle/Optickle into Optickle2-eric
new isSameFreq and Optickle.nu
Merge branch 'Optickle2-yuta' into Optickle2-m3v4n5
Merge branch 'Optickle2-yuta' into Optickle2-m3v4n5
Fixed accounting for RF propagation phase
Merge branch 'Optickle2-yuta' into Optickle2-m3v4n5
Merge branch 'Optickle2-m3v4n5' into Optickle2-jm
This is not necessary any more. It is the same as getDriveMatrix.m
See the optic class.
Removed as it is the same as getDriveMatrix. Optic class deals with this.
"Completed Squeezer.m"
working on tickleDC
"fixed squeezer.m parser.  Added comments to getNoiseMatrix.m for squeezer"
Merge remote-tracking branch 'origin/Optickle2-jm' into Optickle2-m3v4n5