new control
Merge branch 'master' of https://github.com/roguephysicist/calv-test

Conflicts:
	si_as_6/control.sh