 
     if (rotationCounter > 2) {
       Set_Servo(finPosition, abs(finPosition - 2)); //This will output LEFT if finPosition = RIGHT, and vice-versa
->>>>>>> Stashed changes
       endRollFlag = true;
     }
   }
   else { //At this point, continue to make adjustments to prevent roll
     if (abs(event.gyro.z) < MIN_ROLL_THRESHOLD)
     {
-<<<<<<< Updated upstream
-      digitalWrite(inputA, HIGH);
-      servoHomeFlag = true;
-    }
-    else if(event.gyro.z > 0)
-      {
-      digitalWrite(inputA, LOW);
-      servoHomeFlag = false;
-      digitalWrite(inputB, LOW);
-      finState = false;
-      }
-    else if(event.gyro.z < 0)
-      {
-      digitalWrite(inputA, LOW);
-      servoHomeFlag = false;
-      digitalWrite(inputB, HIGH);
-      finState = true;
-      }
-=======
       Set_Servo(finPosition, CENTER);
     }
     else if (event.gyro.z > 0) //Again, this assumes positive gyro values are clockwise.

    {
      Set_Servo(finPosition, LEFT);
    }
>>>>>>> Stashed changes
  }

}

      Etc., etc.

*/

#include <Wire.h>
#include <SPI.h>
