Merge branch 'master' of git.martlubbers.net:msc-thesis1617
authorMart Lubbers <mart@martlubbers.net>
Tue, 13 Jun 2017 13:39:15 +0000 (15:39 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 13 Jun 2017 13:39:15 +0000 (15:39 +0200)

Trivial merge