lt1 branch
BASH
Merge branch 'lt1' of https://github.com/teamdiamond/qtlab into lt1
master branch
BASH
Merge remote-tracking branch 'remotes/origin/master' into lt3_monitor

Conflicts:
	init/80_create_instruments.py
	userconfig.py