Merge branch 'develop' of github.com:dopefishh/bachelor into develop
authorMart Lubbers <mart@martlubbers.net>
Tue, 28 Oct 2014 08:16:56 +0000 (09:16 +0100)
committerMart Lubbers <mart@martlubbers.net>
Tue, 28 Oct 2014 08:16:56 +0000 (09:16 +0100)

Trivial merge