From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 29 Oct 2014 15:01:54 +0000 (+0100)
Subject: Merge branch 'develop' of github.com:dopefishh/bachelor into develop
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=8e5fa918591c6396e1e97085140cb6e647db1002;p=bsc-thesis1415.git

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

8e5fa918591c6396e1e97085140cb6e647db1002