eprimer and calibrations
\
bahs
Merge branch 'master' of https://github.com/teamdiamond/measurement