team914 · acetousk · Feb 28, 2020 · Feb 28, 2020
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,11 @@ compile_commands.json
 temp.log
 temp.errors
 *.ini
+<<<<<<< HEAD
+.d/
+=======
+.d/
+
+#Gitmoji
+node_modules/
+>>>>>>> 0bf49adac01d0f991728d81dc06978e819ed2b0b
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ If you would like to join the mailing list, please email acetousk@gmail.com that
 
 ## License
 
-AutoLib is licensed under the Mozilla Public License 2.0.
+AutoLib is licensed under the MIT License.
 
 ## Thank You!
 Huge Thanks to the following. AutoLib wouldn't be AutoLib without these wonderful people.

diff --git a/autolib.png b/autolib.png
diff --git a/autolib@0.9.3.zip b/autolib@0.9.3.zip
diff --git a/bin/_pros_ld_timestamp.o b/bin/_pros_ld_timestamp.o
diff --git a/bin/monolith.bin b/bin/monolith.bin
diff --git a/bin/monolith.elf b/bin/monolith.elf
diff --git a/common.mk b/common.mk
diff --git a/firmware/libpros.a b/firmware/libpros.a
diff --git a/firmware/odomDebug.a b/firmware/odomDebug.a
diff --git a/firmware/okapilib.a b/firmware/okapilib.a
diff --git a/firmware/v5-common.ld b/firmware/v5-common.ld