Bell BS
BASH
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	scripts/bell/bell_bs.py