test 1
Merge branch 'master' of https://github.com/JakaCikac/pesek

Conflicts:
	requirements.txt