Not sure why git didn't know about these files
Merge commit '30b3b544a7556ee45c6b303fe4a8c519ed4b871f'

Conflicts:
	packages/ham/examples/cpg.yaml
	packages/ham/examples/pair-cpg.yaml
	packages/ham/include/jobholder.h
	packages/ham/include/sequences.h
	packages/ham/include/state.h
	packages/ham/include/tracebackpath.h
	packages/ham/readme.md
	packages/ham/src/ham.cc
	packages/ham/src/jobholder.cc
	packages/ham/src/model.cc
	packages/ham/src/tracebackpath.cc
*&@(!@$&$(!$(!$*($*!$(!$*#(%&!%$#%)%$)))!!!*&@#$*$##$(!@$!!!!!!!!##*(%#(%*$(%*#($*)!$