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

Conflicts:
	index.html
	manifest.json
	pages/demo/script.js