file modified localy
Merge branch 'master' of github.com:mlade77/test

Conflicts:
	test

Now should be OK