Merge branch TeamCMU the 2nd

.gitignore

@@ -1,44 +1,43 @@
-# Prerequisites
-*.d
-*.swp
-
-# 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
-
-# CLion folder
-Source/.idea/*
-Source/cmake-build-debug/*
-cmake-build-debug
-.idea
+# Prerequisites
+*.d
+*.swp
+
+# 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
+
+# CLion folder
+Source/.idea/*
+Source/cmake-build-debug/*
+Source/.DS_Store
+Source/CMakeLists.txt
+cmake-build-debug
+.idea
 .DS_Store
 
-Source/.idea/workspace.xml
-Source/.idea/workspace.xml
-Source/.idea/workspace.xml