 /*
-<<<<<<< HEAD
-  Position Functions
-  Kylie Dale and Michael Guida
-*/
-/*
-=======
  * Position Functions
  * Kylie Dale and Michael Guida
  */
-
+/*
 // ------------------------ Right ------------------------
 
->>>>>>> origin/master
 boolean armAtSideRight() {
   if(backValue > (armSRBackVal - armSRBackTol) && backValue < (armSRBackVal + armSRBackTol)) {
     if(rShoulderValue > (armSRShoulderVal - armSRShoulderTol) && rShoulderValue < (armSRShoulderVal + armSRShoulderTol)) {

  }
  return false;
}
>>>>>>> origin/master

  }
  return false;
}

boolean armFwdLeft135() {
  if(backValue > (armFL135BackVal - armFL135BackTol) && backValue < (armFL135BackVal + armFL135BackTol)) {
