fixing weird stuff from the merge
diff --git a/frc971/constants.h b/frc971/constants.h
index 3f848ac..a481dd3 100755
--- a/frc971/constants.h
+++ b/frc971/constants.h
@@ -45,7 +45,7 @@
::std::function<StateFeedbackLoop<2, 2, 2>()> make_v_drivetrain_loop;
::std::function<StateFeedbackLoop<4, 2, 2>()> make_drivetrain_loop;
-
+
struct ShooterLimits {
double lower_limit;
double upper_limit;
@@ -55,7 +55,7 @@
};
ShooterLimits shooter;
-
+
double shooter_voltage;
double shooter_total_length;
double shooter_hall_effect_start_position;
diff --git a/frc971/prime/prime.gyp b/frc971/prime/prime.gyp
index e23272b..42a9894 100644
--- a/frc971/prime/prime.gyp
+++ b/frc971/prime/prime.gyp
@@ -7,6 +7,8 @@
'<(AOS)/build/aos_all.gyp:Prime',
'../control_loops/drivetrain/drivetrain.gyp:drivetrain',
'../control_loops/drivetrain/drivetrain.gyp:drivetrain_lib_test',
+ '../control_loops/claw/claw.gyp:claw',
+ '../control_loops/claw/claw.gyp:claw_lib_test',
'../control_loops/shooter/shooter.gyp:shooter',
'../control_loops/shooter/shooter.gyp:shooter_lib_test',
'../autonomous/autonomous.gyp:auto',