added name
Merge branch 'f1' into dev

Conflicts:
	New Text Document.txt