Merge branch 'master' of github.com:dopefishh/bachelor
authorMart Lubbers <mart@martlubbers.net>
Mon, 9 Feb 2015 11:30:28 +0000 (12:30 +0100)
committerMart Lubbers <mart@martlubbers.net>
Mon, 9 Feb 2015 11:30:28 +0000 (12:30 +0100)

Trivial merge