hahah is correct

Conflicts:
	contentscript.js
asdf