merged Neil's changeds to robot and odometer into final directory