.
Merge branch 'master' of https://github.com/nedvedj/Semestralka

Conflicts:
	data.pkl