m
Merge branch 'master' of https://github.com/teamdiamond/analysis
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	lib/magnetometry/adaptive_magnetometry.py