a
Merge branch 'master' of https://github.com/curtisblanchette/-canvas-mp3player

Conflicts:
	example.html