Background.js has all functionality in
Update manifest.json
Merge remote-tracking branch 'upstream/master'

Conflicts:
	background.js
	manifest.json