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

Conflicts:
	lib/QEC/hyperfine_params.py
	lib/QEC/nuclear_spin_control.py