Testing possible issues.
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestFolder/TestDocument.txt
Seeing outcome.