conversation between page and extension
made content_script.js run on wikipedia
Merge branch 'master' of github.com:bmalehorn/socket-io-chrome-extension

Conflicts:
	manifest.json