local
Merge branch 'master' of github.com:djgorman/Haeffner-Lab-LabRAD-Tools
Added function for finding trap electrode number from physical dac channel
Merge branch 'master' of github.com:djgorman/Haeffner-Lab-LabRAD-Tools