got hovering working
Merge branch 'darren_branch'

Conflicts:
	manifest.json
	popup.html
	popup.js
Beginning of storage

moved variables from popup to background, added functions for storage
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/popup.js
Fixed merge conflicts
fixed bug
fixed merge issue, added settings
Basic storage now works

saving mood, health, name, kitty_mode, study_mode, timeout, total_time
updated initial icon to be icon_off.png
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/popup.js
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
Merge branch 'master' into darren_branch

Conflicts:
	js/popup.js
merging problem fixed from master
moved images correctly
fixed bug for power button