co datatypes complete!
Merge branch 'master' of https://github.com/Waller-Lab/CalOptrics