From beb1404b867c6ca471483684ddd8cca5fb39f996 Mon Sep 17 00:00:00 2001
From: g-spacewhale <17550607+g-spacewhale@users.noreply.github.com>
Date: Sat, 18 Nov 2017 10:24:34 +0100
Subject: [PATCH] Merge branch 'master' into TeamCMU

---
 ..gitignore.swp | Bin 0 -> 1024 bytes
 .gitignore      |  32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 ..gitignore.swp
 create mode 100644 .gitignore

diff --git a/..gitignore.swp b/..gitignore.swp
new file mode 100644
index 0000000000000000000000000000000000000000..ec9754c0c666d8978335db1e16d7248912484f98
GIT binary patch
literal 1024
zcmYc?$V<%2S1{5u)iY*50(#604E{xldFiQ0f;gBVsfjr_q)>$Q(lbjk)ARC+h%ggH
P<0xk|1V%%ECLsU-^?eIo

literal 0
HcmV?d00001

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d99efa9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
\ No newline at end of file