Merge branch 'master' of https://github.com/tonistiigi/drawmusic

Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/tonistiigi/drawmusic

Conflicts:
	public/index.html