added a line from feature-1 branch
Merge branch 'my-feature-1' into develop

Conflicts:
	test-Files/first-test-file.txt