commit
Merge branch 'master' of https://github.com/zephimir/Mille-Staff

Conflicts:
	index.html
	style.css
	tabletop/src/tabletop.js