I know what I'm doing now.
ALMOST THERE!
Merge branch 'master' into angel's-branch

Conflicts:
	index.html
	scripts/main.js
	scripts/playlist-example.js
final product
Merge branch 'angel's-branch'
Merge branch 'master' of https://github.com/sayangel/mad-lyricz