merge
Merge branch 'master' of https://github.com/xiangcy/youtube-extension
add style to popup
Merge branch 'master' of https://github.com/xiangcy/youtube-extension

Conflicts:
	popup.html