voting working
Merge branch 'master' of https://github.com/SandyWalsh/jukebox

Conflicts:
	playlist.html