add gray button asset
Added dynamically changing icons

New icon, changed icon.png to icon_on.png, updated manifest.json, added
new function in background.js to turn on/off blocking which changes a
variable and icon
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	popup.html
	popup.js
added query and modified popup.js
Fixed redirecting and added jquery

Made url in webRequest and manifest the same, added files and script to
run jquery
Merge remote-tracking branch 'origin/master'

Conflicts:
	popup.html
got button to change
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	popup.js
fixed manifest.json
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	manifest.json
Andy's changes: new html pages after buttons clicked