#50 done
Merge branch 'master' of github.com:Nozdi/shmir into rabbitmq

Conflicts:
	src/shmir/app.py