Ignoring generated files
Ignoring generated files
Ignoring generated files
Ignoring generated files
Ignoring generated files
Ignoring generated files
Merge branch 'master' into jbinney

Conflicts:
	SafetyLight_msgs/msg_gen/cpp/include/SafetyLight_msgs/SetColor.h
	SafetyLight_msgs/msg_gen/cpp/include/SafetyLight_msgs/SetGreen.h
	SafetyLight_msgs/msg_gen/cpp/include/SafetyLight_msgs/SetRed.h
	SafetyLight_msgs/msg_gen/cpp/include/SafetyLight_msgs/SetYellow.h
	SafetyLight_msgs/msg_gen/lisp/SafetyLight_msgs-msg.asd
	SafetyLight_msgs/msg_gen/lisp/_package.lisp
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/GraspObjectResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/HoldKeyResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LocateObjectsResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtHandResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/LookAtResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ManipulateObjectResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveArmResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/MoveJointsResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/PreshapeHandResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/RepositionObjectResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/ScanForObjectResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationAction.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationActionFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationActionGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationActionResult.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationFeedback.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationGoal.h
	arm_behavior_actions/msg_gen/cpp/include/arm_behavior_actions/TestCalibrationResult.h
	arm_behavior_actions/msg_gen/lisp/_package.lisp
	arm_behavior_actions/msg_gen/lisp/arm_behavior_actions-msg.asd
	arm_calibrate_extrinsics/srv_gen/cpp/include/arm_calibrate_extrinsics/CalibrateExtrinsics.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/Acceleration.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/CalibrateForceTorqueSensor.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/CalibrateForceTorqueSensorStatus.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/CalibratePressureSensors.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/CalibratePressureSensorsStatus.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/ControllerStatus.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/EndEffectorState.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/FingerForceControlGains.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/Grasp.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/GraspStatus.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/IncreaseMaxFingerTorque.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/PressureSensors.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/ResetBreakaway.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/ResetBreakawayStatus.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/StrainGauge.h
	arm_controller_msgs/msg_gen/cpp/include/arm_controller_msgs/UpdateStrainGagesCalibration.h
	arm_controller_msgs/msg_gen/lisp/_package.lisp
	arm_controller_msgs/msg_gen/lisp/arm_controller_msgs-msg.asd
	arm_dashboard_client/bin/dashboard_client_test
	arm_dashboard_client/lib/libarm_dashboard_client.so
	arm_head_control/msg_gen/lisp/_package.lisp
	arm_head_control/msg_gen/lisp/arm_head_control-msg.asd
	arm_msgs/msg_gen/cpp/include/arm_msgs/BoundingBox.h
	arm_msgs/msg_gen/cpp/include/arm_msgs/InertialParameters.h
	arm_msgs/msg_gen/cpp/include/arm_msgs/Object.h
	arm_msgs/msg_gen/cpp/include/arm_msgs/Objects.h
	arm_msgs/msg_gen/cpp/include/arm_msgs/StatusReport.h
	arm_msgs/msg_gen/cpp/include/arm_msgs/Task.h
	arm_msgs/msg_gen/cpp/include/arm_msgs/Tasks.h
	arm_msgs/msg_gen/lisp/_package.lisp
	arm_msgs/msg_gen/lisp/arm_msgs-msg.asd
	arm_msgs/srv_gen/cpp/include/arm_msgs/FindObject.h
	arm_msgs/srv_gen/cpp/include/arm_msgs/FindObjectMulti.h
	arm_msgs/srv_gen/cpp/include/arm_msgs/GetTableCoeffs.h
	arm_msgs/srv_gen/lisp/_package.lisp
	arm_msgs/srv_gen/lisp/arm_msgs-srv.asd
	ccny_vision/ar_target/bin/ar_multi
	ccny_vision/ar_target/bin/ar_multiple_single
	ccny_vision/ar_target/bin/ar_single
	ccny_vision/ar_target/bin/ar_synchronize
	ccny_vision/ar_target/bin/mk_patt
	ccny_vision/ar_target/msg_gen/cpp/include/ar_target/ARMarker.h
	ccny_vision/ar_target/msg_gen/cpp/include/ar_target/ARMarker3d.h
	ccny_vision/ar_target/msg_gen/cpp/include/ar_target/ARMarkers.h
	ccny_vision/ar_target/msg_gen/cpp/include/ar_target/ARMarkers3d.h
	ccny_vision/ar_target/msg_gen/lisp/_package.lisp
	ccny_vision/ar_target/msg_gen/lisp/ar_target-msg.asd
	pier/lib/pier_ext.so
	usc_utilities/lib/libusc_utilities.so
	usc_utilities/msg_gen/cpp/include/usc_utilities/AccumulatedTrialStatistics.h