getting pormodoro working
connect settings to popup.js functions
gifs and icons
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	popup.html
GOT PORMODORO WORKING
fixed power button bug
got health and moods to work
removed console.logs
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/background.js
	manifest.json
	settings.html
Broken code trying to save urls
Revert "Broken code trying to save urls"

This reverts commit 480b946b64aaa6b43f1bed74da3c3f293ecbcc34.