rollback
Merge branch 'master' of https://github.com/doraDemon/noname

Conflicts:
	background.js