updating directories
Merge branch 'master' of https://github.com/cwelke/zhmet-looper
undo
Merge commit '3f7516df5a654f16c7046d0c5b0f371a4d839885' into mt2jstudy_branch

Conflicts:
	mainTemplateLooper.cc
	mainTemplateLooper.h
Merge branch 'mt2jstudy_branch' of https://github.com/cwelke/zhmet-looper into mt2jstudy_branch