commit
Merge https://github.com/JiriHrba/Knihovna_SAN

Conflicts:
	Knihovna_SAN.suo