Merge branch display into release

src/Dezibot.cpp

@@ -3,7 +3,11 @@
 //
 
 
+#define SDA_PIN 1
+#define SCL_PIN 2
+
 #include "Dezibot.h"
+<<<<<<< HEAD
 #include <SPI.h>
 
 #include <Adafruit_NeoPixel.h>
@@ -14,10 +18,27 @@
 #define GPIO_LED 48
 
 void Dezibot::begin(void) {
+=======
+#include <Wire.h>
+
+Dezibot::Dezibot():multiColorLight(){};
+
+void Dezibot::begin(void) {
+    Wire.begin(SDA_PIN,SCL_PIN);
+    infraredLight.begin();
+    lightDetection.begin();    
+>>>>>>> remotes/origin/feature/#9-display
     motion.begin();
     lightDetection.begin();
     colorDetection.begin();
     multiColorLight.begin();
+<<<<<<< HEAD
     motionDetection.begin();
     infraredLight.begin();
 }
+=======
+    display.begin();
+};
+
+
+>>>>>>> remotes/origin/feature/#9-display