Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	background.js
	css/custom.css
	script.js
update script.js