todo
Merge branch 'master' of github.com:jordsti/stici

Conflicts:
	stici-worker/readme.md