Research
Merge branch 'master' of github.com:dhale/idh

Conflicts:
	bench/src/fah/demo.py