Merge branch TeamCMU the 2nd

.gitignore

@@ -1,44 +1,43 @@
-# Prerequisites
+# Prerequisites
-*.d
+*.d
-*.swp
+*.swp
-
+
-# Compiled Object files
+# Compiled Object files
-*.slo
+*.slo
-*.lo
+*.lo
-*.o
+*.o
-*.obj
+*.obj
-
+
-# Precompiled Headers
+# Precompiled Headers
-*.gch
+*.gch
-*.pch
+*.pch
-
+
-# Compiled Dynamic libraries
+# Compiled Dynamic libraries
-*.so
+*.so
-*.dylib
+*.dylib
-*.dll
+*.dll
-
+
-# Fortran module files
+# Fortran module files
-*.mod
+*.mod
-*.smod
+*.smod
-
+
-# Compiled Static libraries
+# Compiled Static libraries
-*.lai
+*.lai
-*.la
+*.la
-*.a
+*.a
-*.lib
+*.lib
-
+
-# Executables
+# Executables
-*.exe
+*.exe
-*.out
+*.out
-*.app
+*.app
-
+
-# CLion folder
+# CLion folder
-Source/.idea/*
+Source/.idea/*
-Source/cmake-build-debug/*
+Source/cmake-build-debug/*
-cmake-build-debug
+Source/.DS_Store
-.idea
+Source/CMakeLists.txt
+cmake-build-debug
+.idea
 .DS_Store
 
-Source/.idea/workspace.xml
-Source/.idea/workspace.xml
-Source/.idea/workspace.xml