Uncommited changed
Merge branch 'master' of https://github.com/adchilds/CXV

Conflicts:
	src/Controllers/calibrate_controller.py
	src/Controllers/dicom_controller.py
	src/Controllers/polyline_controller.py
	src/Models/rectangle_model.py