upravy
Merge branch 'master' of https://github.com/LukasMaly/fabo-projekt

Conflicts:
	fabo_projekt.m