Merge branch 'timing' of ssh://github.com/jeffsegall/maestro into timing-feedback
Merge branch 'timing-feedback' of ssh://github.com/jeffsegall/maestro into timing-feedback
Merge branch 'timing' of https://github.com/jeffsegall/maestro
Merge branch 'timing-feedback' of https://github.com/jeffsegall/maestro
Merge branch 'staging' of https://github.com/jeffsegall/maestro
Merge branch 'master' of https://github.com/jeffsegall/maestro
I have no idea why this was in the master branch. It's screwing up
staging.
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
Don't ask me why I had to do this. Doens't make sense to me either.
Merge branch 'master' of https://github.com/jeffsegall/maestro into staging

Conflicts:
	hubomsg/msg/HuboCommand.msg
	maestro/include/RobotControl.h
	maestro/src/RobotControl.cpp