final changes
Merge branch 'master' of https://github.com/plisekd/school.git

Conflicts:
	BIK-DBS-Semestralka/main.xml