bla
Merge branch 'master' of github.com:agnesvanbelle/COSPproject
terrier + docreader edit