kl
Merge branch 'master' of https://github.com/kulatamicuda/test
t
Merge branch 'master' of https://github.com/kulatamicuda/test

Conflicts:
	pokusnej.txt