Final update
Merge branch 'master' of https://github.com/hazyvision/optiBST

Conflicts:
	optBST.py