playlist
Merge branch 'master' of https://github.com/philzepeda/video-play

Conflicts:
	index.html