Merge branch 'master' of git.martlubbers.net:msc-thesis1617 master
authorMart Lubbers <mart@martlubbers.net>
Wed, 23 Aug 2017 09:48:50 +0000 (11:48 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 23 Aug 2017 11:03:11 +0000 (13:03 +0200)

Trivial merge