merged other changes

ed7coyne · ed7coyne · commit 63551e89b039 · 2016-10-28T15:12:45.000-07:00
diff --git a/src/thing/Config.h b/src/thing/Config.h
@@ -1,3 +1,6 @@
+#ifndef THING_CONFIG_H
+#define THING_CONFIG_H
+
 namespace thing {
 
 struct Config {
@@ -14,4 +17,6 @@ struct Config {
   int pin_analog_out;
 };
 
-}
+}  // namespace thing
+
+#endif  // THING_CONFIG_H
diff --git a/src/thing/Transcriber.h b/src/thing/Transcriber.h
@@ -23,7 +23,6 @@
 #include <vector>
 #include "Firebase.h"
 #include "FirebaseObject.h"
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
 #include "thing/Config.h"
 
 namespace thing {
