Signed-off-by: Steven Shipman <shipman@ncf.edu>
Merge branch 'newcollege' of https://github.com/pategroup/bband_scripts.git into newcollege

Conflicts:
	autofit/windows/prog_A_v12.py

Signed-off-by: Steven Shipman <shipman@ncf.edu>