committing so i can pull
Merge branch 'master' of https://github.com/sam1rm/pandoracle

Conflicts:
	chrome-ext/manifest.json
my changes
Merge branch 'master' of https://github.com/sam1rm/pandoracle
Added ability to convert youtube videos