bell bs

BASH
ff
Merge branch 'master' of file:///y:/measurement/ into bs_branch

Conflicts:
	lib/measurement2/qutau/qutau_measurement.py
	scripts/QEC/ElectronRamsey_With_C13_Initializaiton.py