Temp commit, merging
Merge branch 'master' of http://github.com/gizatt/biped_robot_rbpi
Commit for merge
Merge branch 'master' of http://github.com/gizatt/biped_robot_rbpi
merge conflict resolve