measurements, hannes
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/sequence.py
	scripts/bell/sweep_Bell.py