Merge branch 'reflection_development' of gitlab.science.ru.nl:kuhnen/ssproject1617
authorDaan Sprenkels <dsprenkels@gmail.com>
Fri, 25 Nov 2016 09:04:42 +0000 (10:04 +0100)
committerDaan Sprenkels <dsprenkels@gmail.com>
Fri, 25 Nov 2016 09:04:42 +0000 (10:04 +0100)

Trivial merge