Update test.txt
Update test2.txt
zmena text suboru
merge master