-<<<<<<< HEAD
+
 #include <SI114.h>
 #include <Si114_defs.h>
-=======
->>>>>>> b8f354195f0457a8ab440ac40eebc8ff8f870205
 #include <Adafruit_FRAM_I2C.h>
 #include <Adafruit_TMP006.h>
 #include <Adafruit_Sensor.h>

  Serial.begin(57600);
  Serial.println("Waiting for connection...");
  RFduinoBLE.begin();
<<<<<<< HEAD
=======
  
  //Check to see if temperature sensor is found
>>>>>>> b8f354195f0457a8ab440ac40eebc8ff8f870205
  if (! tmp006.begin()) {
    Serial.println("No temperature sensor found");
    while (1);
  }
  
  //Check 6
  if (fram.begin()) {  // you can stick the new i2c addr in here, e.g. begin(0x51);
    Serial.println("Found I2C FRAM");
  } else {

  
  //Heart Rate Monitor Read 
  Wire.beginTransmission(HRAddress);  // transmit to SI1146 Heart Rate Monitor device #96 (0x60)

 // Grab temperature measurements and print them.
  float objt = tmp006.readObjTempC();
  Serial.print("Object Temperature: "); Serial.print(objt); Serial.println("*C");
