This is a test
Merge branch 'Part3' of https://github.com/mherman11/CameraLab into Part3