Mark has done write words
Merge branch 'master' of https://github.com/kramff/Score-Conflict-2

Conflicts:
	test3.txt