some changes
Merge branch 'master' of https://github.com/noamshe/wordy_extension

Conflicts:
	manifest.json