from LT3_Anais
Merge branch 'master' of https://github.com/teamdiamond/measurement
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/bell_lt3.py