magnetometry
-MB
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/m2/ssro/sequence.py
	lib/magnetometry/adaptive_magnetometry.py
	scripts/magnetometry/adaptive_magnetometry_analysis.py
	scripts/magnetometry/adaptive_magnetometry_simulations.py
-MB
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/magnetometry/adaptive_magnetometry.py
	scripts/magnetometry/adaptive_magnetometry_analysis.py
	scripts/magnetometry/adaptive_magnetometry_simulations.py
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/magnetometry/adaptive_magnetometry.py
	scripts/magnetometry/adaptive_magnetometry_simulations.py
magnetometry analysis
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/m2/ssro/sequence.py
	lib/magnetometry/adaptive_magnetometry.py
	scripts/magnetometry/adaptive_magnetometry_analysis.py
	scripts/magnetometry/adaptive_magnetometry_simulations.py