From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 9 Feb 2015 11:30:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/bachelor
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=f012fc87945502d0b6016789653cf8eaebb8689d;p=bsc-thesis1415.git

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

f012fc87945502d0b6016789653cf8eaebb8689d