in progress - preserve vote
Merge branch 'master' of https://github.com/SandyWalsh/jukebox

Conflicts:
	playlist.html
Merge branch 'master' of https://github.com/SandyWalsh/jukebox