The file is now correct
John's changes.
Merge branch 'issue-2'

Conflicts:
	test.txt