Merge branch 'master' of gitlab.science:mlubbers/ssproject1617

diff --cc report/.gitignore
Simple merge

diff --cc report/Makefile
index a4ec3a0,9426ffd..9ba9f50
--- 1/report/Makefile
--- 2/report/Makefile
+++ b/report/Makefile
@@@ -20,9 -19,6 +19,6 @@@ all: $(DOC).pd
        grep -qF 'Please rerun LaTeX.' $(basename $<).mlog &&\
                $(LATEX) $(LATEXFLAGS) $< || true
  
- %.png: %.eps
-       convert -density 300 $< -resize x1000 $@
- 
  clean:
 -      $(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml pdf)\
 +      $(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml pdf out)\
                $(DOC)-blx.bib logo.png