modified test2

deleted first line
del
added
asdf
zmena
dalsia
novy subor new
Merge branch 'br'

Conflicts:
	test2.php