Merge pull request #1 from Nestel/master

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

Conflicts:
	semestralka.tex
final asi
Merge pull request #2 from Nestel/kubko

Kubko