Merge branch 'dev' into research

Clovel · Sep 4, 2019 · 35536bd · 35536bd
2 parents cab37df + cf4d0dd
commit 35536bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,8 +5,6 @@ Testing*/
 image_*/
 output/
 
-
-
 # CMake related files ---------------------------
 Makefile
 CMakeCache.txt
@@ -53,3 +51,6 @@ a.out
 
 web-example
 !web-example/
+
+# macOS files -----------------------------------
+.DS_Store
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Lämp
+# Let There Be Light !
 
 Connected lamp project