scripts, THT
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/QEC/calibrate_magnet_perpendicular.py