From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 5 Feb 2015 18:10:54 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/bachelor
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=5729a7101e4e531f182285878c49e50851a60a7f;p=bsc-thesis1415.git

Merge branch 'master' of github.com:dopefishh/bachelor
---

5729a7101e4e531f182285878c49e50851a60a7f