Signed-off-by: stranchong <stranchong@gmail.com>
Merge branch 'master' of git@github.com:iyaozhen/Hi-Todo-Extension.git

Conflicts:
	js/background.js
	js/content-scripts.js

Signed-off-by: stranchong <stranchong@gmail.com>