Merge branch 'master' of git.martlubbers.net:msc-thesis1617
authorMart Lubbers <mart@martlubbers.net>
Thu, 29 Jun 2017 07:50:02 +0000 (09:50 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 29 Jun 2017 07:50:02 +0000 (09:50 +0200)

Trivial merge