From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 2 Feb 2015 13:33:49 +0000 (+0100)
Subject: Merge branch 'develop' of github.com:dopefishh/bachelor into develop
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=93f0b84185359d31266795ba48f40a3ca34c75ca;p=bsc-thesis1415.git

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

93f0b84185359d31266795ba48f40a3ca34c75ca