script now works in extension
fixed merge conflict
Merge branch 'master' of https://github.com/Fishythefish/chromescript

Conflicts:
	manifest.json

fixed conflict again