added query and modified popup.js
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
Linked background variables to popup

Got rid of call to background.js in popup.html, created new variable to
grab background page, set initial state to not block