getting more in the way
fixing rebase merge commit
adding robot legs!
Merge branch 'robot_arm' of github.com:spacewaffle/new_git_app into robot_arm