final edit
lalaMerge branch 'kubko' of https://github.com/Nestel/dbs into kubko

Conflicts:
	semestralka.tex
final asi