Merge branch 'master' of github.com:dopefishh/bachelor
authorMart Lubbers <mart@martlubbers.net>
Thu, 5 Feb 2015 18:10:54 +0000 (19:10 +0100)
committerMart Lubbers <mart@martlubbers.net>
Thu, 5 Feb 2015 18:10:54 +0000 (19:10 +0100)

Trivial merge