Merge remote-tracking branch 'remotes/origin/master'

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