Merge pull request #21 from fiveseven808/dev

v047-0314.57.a alpha, but should work
fiveseven808 · Mar 15, 2017 · 05ff2a2 · 05ff2a2
2 parents 9f3238b + 42e1242
commit 05ff2a2
Show file tree

Hide file tree

Showing 56 changed files with 622 additions and 32,690 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,14 @@
 #stuffs folder with my psd and everything lol
-stuffs/
+#stuffs/
 
 #for my HA suff
-HA/
+#HA/
 
 # Experiment stuff
-Experiment/
-Trash/
-Archive/
-Example Scenes/
+#Experiment/
+#Trash/
+#Archive/
+#Example Scenes/
 
 
 # Windows image file caches

diff --git a/Archive/authtest.py b/Archive/authtest.py
diff --git a/Archive/oledmenuarduino.cpp b/Archive/oledmenuarduino.cpp