added some text
test3 changes

changes in test3
Merge branch 'asd-branch'

Conflicts:
	test3.txt