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

Conflicts:
	scripts/espin/electron_T1.py
QEC NK