added text
Merge

Conflicts:
	tekstfil.txt
Uploaded new ver. merge.