d
d sample change
Merge branch 'develop'

Conflicts:
	sample.txt