test
Merge branch 'master' of https://github.com/gw-analysis/detector-characterization into gui

Conflicts:
	HasKAL/src/HasKAL/GUI_Utils/GUI_Utils.hs
test