QEC - JC
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/QEC/ElectronRamsey_With_C13_Initializaiton.py