Merging
Merge branch 'master' of https://github.com/adriansoghoian/extension

Conflicts:
	README.md
	manifest.json