Player
Merge branch 'master' of github.com:gre/zampling

Conflicts:
	src/main.js