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

Conflicts:
	web/static/index.html