negyedik sor 2
Merge branch 'origin/master'

Conflicts:
	elso.txt