added endSong()
Merge branch 'master' of https://github.com/lstarrett/jukebox

Conflicts:
	python/server.py
did stuff