Merge branch 'master' of https://github.com/sunlee-newyork/Whisper

Conflicts:
	README.md
	manifest.json
	message.css
	message.js
	settings.css
	settings.html
	settings.js
	whisper.js