From: Kelley van Evert <hello@kelleyvanevert.nl>
Date: Wed, 30 Nov 2016 12:58:33 +0000 (+0100)
Subject: Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=bf85c6f569c297c733227d532cbaec0dd663e985;p=ssproject1617.git

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

bf85c6f569c297c733227d532cbaec0dd663e985