update zmena udajov
Merge branch 'master' of https://github.com/Nestel/dbs

Conflicts:
	semestralka.aux
	semestralka.log
	semestralka.out
	semestralka.pdf
	semestralka.tex
	semestralka.toc
uhm