From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 24 Jul 2014 10:05:08 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4d14da45f53f7860f23d59bc138978ea020c0d74;p=bsc-thesis1415.git

Merge branch 'develop'

Conflicts:
	thesis/methods.tex
---

4d14da45f53f7860f23d59bc138978ea020c0d74