test
Merge branch 'master' of github.com:Spacejoker/buff

Conflicts:
	manifest.json
	popup.html