changed a few things
Merge branch 'master' of https://github.com/Nestel/dbs

Conflicts:
	semestralka.pdf
	semestralka.tex