Merge branch 'master' of https://github.com/karolgil/MO

Conflicts:
	odjazd.py