added text
Merge branch 'Feature1' into develop

Conflicts:
	New Text Document.txt