Simple test dddd
Merge remote-tracking branch 'origin/working.copy'

Conflicts:
	test.txt