added
asdf
nova vec
zmena
dalsia
novy subor new
Merge branch 'br'

Conflicts:
	test2.php
Merge branch 'master' into test