change to utf-8
Merge branch 'TestD'

Conflicts:
	sample.txt