Merge branch 'develop' of github.com:dopefishh/bachelor into develop
authorMart Lubbers <mart@martlubbers.net>
Thu, 19 Jun 2014 11:13:41 +0000 (13:13 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 19 Jun 2014 11:13:41 +0000 (13:13 +0200)

Trivial merge