modified:   scripts/start_ide.py
Merge branch 'master' of https://github.com/manipp4/qubit_setup
	modified:   instruments/jba_sb.py