txt a2

Conflicts:
	teszt.txt