fixed bug
fixed bug
edits to comments
removed error
manually merged andy's stuff let's hope it works
fixed merge issue, added settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/popup.js
Can now add urls to blocked list

Updated settings.html, created settings.css, added message communication
between popup and background, created new listener that removes the old
web request listener and adds the new web request listener, added
permission to all sites