Merge branch 'feature-normal-science-backport' into feature-gui

This commit is contained in:
LSaldyt
2017-11-18 18:32:13 -07:00
19 changed files with 562 additions and 168 deletions

1
.gitignore vendored
View File

@ -19,6 +19,7 @@ pip-log.txt
# Unit test / coverage reports
.coverage
.tox
.log
# Other filesystems
.svn