minor fix
reduced rise time
fixed a mistake, note to self-document estimated state better in future
Merge branch 'master' of https://github.com/erudnick-cohen/tortuga

Conflicts:
	packages/control/src/CombineController.cpp