pokus o conflict
Merge branch 'master' of github.com:dygestor/skuska

Conflicts:
	main.py