fix
fix
Merge branch 'master' of github.com:kuniiskywalker/chrome_extentions

Conflicts:
	test_memory/content.js