settings changes?
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	js/background.js
	js/popup.js
	manifest.json
bug fix cat not sleep when on reload
more gifs
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014
browser icons
got images working
fixed bug
arrow fix
arrow fix 2
Broken code trying to save urls
Revert "Broken code trying to save urls"

This reverts commit 480b946b64aaa6b43f1bed74da3c3f293ecbcc34.
Can now add urls to block
setting images hover works yay!!!!!
Merge remote-tracking branch 'origin/master' into Anthony