From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 23:04:31 +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=8f23beb31ecb927bba579d052dfac92bf7bbe0ae;p=test.git

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

Conflicts:
	test1.txt
Keeping user2 text in merge
---

8f23beb31ecb927bba579d052dfac92bf7bbe0ae