commit show list song in playlist
commit play with list
Merge branch 'local'

Conflicts:
	templates/index.html