Merge pull request #16 from AntonRodenhauser/master

stable version ready to be released (10.30.17)
SCIInstitute · Oct 31, 2017 · acb7e9f · acb7e9f
2 parents 8817899 + 0774037
commit acb7e9f
Show file tree

Hide file tree

Showing 170 changed files with 6,222 additions and 2,823 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,11 @@
 *.asv
 .DS_Store
 *.m~
-*test*
+test*
+
+!*ProcessingDataNoUserInteractionPreprocessed.mat
+!*ScriptDataNoUserInteractionPreprocessed.mat
+!*Run*.mat
+
+!*fileSplittingUnitTestScriptData.mat
 
diff --git a/DOC/PfeiferDocumentation.pdf b/DOC/PfeiferDocumentation.pdf