deleted my version of keys
letrs do this
Merge branch 'master' of https://github.com/alkalai2/SpoilerAlert

Conflicts:
	chrome_ext/keys.txt