different detectors
Merge remote-tracking branch 'origin/master'

Conflicts:
	HBT.py
conflict correcting