test merger conflicts 2
Merge branch 'master' of https://github.com/dtyuen/tests-repo

Conflicts:
	D.txt