Added new content
Merge branch 'master' of https://github.com/juliacochran/netiquette

Conflicts:
	javascripts/popup.js