ok, sta sad da radim?
Merge branch 'master' into dule

Conflicts:
	marko.py
Merge pull request #1 from Bovril/dule

Dule