.
Merge branch 'master' of https://github.com/madewithbrio/musicbozz

Conflicts:
	service/websocket-1/log/run
	service/websocket-2/log/run
	service/websocket/log/run
	web/static/js/main.js