zaloha
Merge branch 'master' of https://github.com/hypertornado/diplomka

Conflicts:
	text/kap2.tex