Merge branch 'master' of github.com:dopefishh/bachelor
authorMart Lubbers <mart@martlubbers.net>
Sun, 8 Mar 2015 08:15:36 +0000 (09:15 +0100)
committerMart Lubbers <mart@martlubbers.net>
Sun, 8 Mar 2015 08:15:36 +0000 (09:15 +0100)

Trivial merge