Resize music player
checkpoint
Merge branch 'master' into templatize

Conflicts:
	public/index.html
	public/js/combinator.js
templatized. Fancybox temporarily doesn't work
templatized. Fancybox temporarily doesn't work