pr
Merge branch 'master' of https://github.com/abaddonGIT/FontSquirrelExtension

Conflicts:
	js/popup.js