From: Gary Macbook <gsteele13@gmail.com>
Date: Thu, 19 Nov 2015 13:03:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=d06c5fc0c9c24427aa9021bcc14b40505b1afb14;p=test.git

Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test

Conflicts:
	test1.txt
---

d06c5fc0c9c24427aa9021bcc14b40505b1afb14