scripts -MAR
magnetometry analysis scripts - Cristian
Merge branch 'master' of https://github.com/teamdiamond/analysis

Conflicts:
	scripts/espin/electron_rabi_analysis.py