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

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

Conflicts:
	scripts/magnetometry/adaptive_magnetometry_simulations.py
	scripts/magnetometry/generate_adaptive_table.py