conversation between page and extension
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
conversation between page and extension
Merge branch 'messages-squashed'
Merge pull request #3 from bmalehorn/master

"hello world" conversation between content_script.js and background.js