1
Merge branch 'master' of
https://github.com/fangzheng931/chrome-plugin.git

Conflicts:
	js/background.js
	js/content_start.js
	js/menu.js