Merge branch 'master' into TeamCMU

adding current master changes to branch
2017-11-18 20:42:30 +01:00
parent 57340e9ec3 8ddc13d65c
commit 85da2a4def
2 changed files with 32 additions and 31 deletions
@@ -1,5 +1,6 @@
 # Prerequisites
 *.d
+*.swp

 # Compiled Object files
 *.slo