something works that might be useful
Merge branch 'master' of https://github.com/dmerrill6/BitChrome

Conflicts:
	manifest.json