Test
Merge branch 'anton' of github.com:antonbarty/cheetah into anton

Conflicts:
	source/lcls-psana/cheetah_ana_pkg/src/cheetah_ana_mod.cpp
Merge branch 'anton' of github.com:antonbarty/cheetah into anton
Filename fiddling