Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
authorGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:04:31 +0000 (00:04 +0100)
committerGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:04:31 +0000 (00:04 +0100)
commit8f23beb31ecb927bba579d052dfac92bf7bbe0ae
treee3ea2ccd6b47d24a67e343150073ff122c71c8e2
parenta77090b7ed3b53e8583dbfe4d3bb651fae365108
parent6bf9b775fd18385db494ded584ef7258dfe4d1e8
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test

Conflicts:
test1.txt
Keeping user2 text in merge