Merge branch 'master' into TeamCMU

adding current master changes to branch

.gitignore

@@ -1,32 +1,33 @@
-# Prerequisites
+# Prerequisites
-*.d
+*.d
-
+*.swp
-# Compiled Object files
+
-*.slo
+# Compiled Object files
-*.lo
+*.slo
-*.o
+*.lo
-*.obj
+*.o
-
+*.obj
-# Precompiled Headers
+
-*.gch
+# Precompiled Headers
-*.pch
+*.gch
-
+*.pch
-# Compiled Dynamic libraries
+
-*.so
+# Compiled Dynamic libraries
-*.dylib
+*.so
-*.dll
+*.dylib
-
+*.dll
-# Fortran module files
+
-*.mod
+# Fortran module files
-*.smod
+*.mod
-
+*.smod
-# Compiled Static libraries
+
-*.lai
+# Compiled Static libraries
-*.la
+*.lai
-*.a
+*.la
-*.lib
+*.a
-
+*.lib
-# Executables
+
-*.exe
+# Executables
-*.out
+*.exe
+*.out
 *.app