bugfix
Merge branch 'queue'
Merge branch 'master' of https://github.com/smab/playhouse-web

Conflicts:
	src/queue.py