fixed arm state psotins
Merge branch 'master' of /home/rover/Rover2014
Shape match working, and editing cords for the arm
Merge branch 'master' of 192.168.0.64:/home/rover/Rover2014