For now, master will only work with timing-feedforward branch of hubo_ros.
Trying to push a fix.
Merge branch 'master' of https://github.com/jeffsegall/maestro

Conflicts:
	maestro/include/RobotControl.h
	maestro/src/RobotControl.cpp