adding more functionality to popup.js
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	popup.html
setup folders and buttons can swap now
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
Connected background variables to popup

Removed reference to background.js in popup.html, added new variable in
popup.js to grab background page, set initial to not blocking
changed ordering of directories, buttons work
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	popup.js
Fixed initial icon

Changed initial icon to icon_off for consistency
still working on buttons
settings page completed (images need to be changed)