minor change
Merge branch 'master' of https://github.com/timcroydon/forktest

Conflicts:
	test.txt