ssro_fast_pi
BASH
Adwin scripts, related to adaptive magnetometry, THT
Some magnetometry and magnet alignment changes, THT
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/ssro/ssro_fast_with_pi.py
JC THT
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	lib/measurement2/adwin_ssro/pulsar_msmt.py