add test 4
Merge branch 'master' of git@github.com:terry-j/project1.git

Conflicts:
	test1.txt