Merge branch 'master' into travis_pypi

.gitignore

@@ -25,6 +25,7 @@ log/
 # Documentation
 docs/build/*
 docs/_*
+docs/source/source_files/*
 
 .nfs*
 

.travis.yml

@@ -29,6 +29,12 @@ jobs:
         - pip install black
       script:
         - black --check .
+    - stage: documentation
+      name: "documentation test"
+      install:
+        - pip install sphinx sphinx_rtd_theme sphinxcontrib-apidoc pyyaml numpy
+      script:
+        - sphinx-build -W -v -b html docs/ docs/_build/
     - stage: general_tests
       name: "General Tests"
       install:
@@ -38,6 +44,7 @@ jobs:
         - pip install tensorboardX
         - python setup.py install
       script:
+        - python -c "import skimage" # fix failing test due to static tls loading
         - pytest --ignore=examples # use pytest instead of python -m pytest
     - stage: tf_example_tests
       name: "Tensorflow examples test"

CONTRIBUTING.md

@@ -2,6 +2,11 @@
 
 The following is a set of guidelines for contributing to edflow. These are mostly guidelines, not rules. Use your best judgment on when to apply them and always be nice to each other :heart:.
 
+> ### code-block
+> In your docstring write **``.. code-block:: <language>``**, when showing examples.
+>
+> This comment is right here, because everyone seems to do it wrong.
+  
 #### Table Of Contents
 
 [Code of Conduct](#code-of-conduct)