zmenil som daco
Merge branch 'master' of http://github.com/refi93/rep

Conflicts:
	main.py