change 2
Merge branch 'master' of https://github.com/nigelcallaghan/gittest1

Conflicts:
	file2.txt