added another txt
muahah2
Merge branch 'feature3'

Conflicts:
	myText.txt