Arm controller edited
Merge branch 'master' of github.com:OregonStateMarsRover/Rover2014