added anthony's face + some popup.js
got background.js and working on popup.js
added kitten.jpg and can grab dom elements now
popup.js modifications
popup updates
something is weird between branch and master
merged with master and got a lot of crap working
still working on buttons
Merge branch 'master' into darren_branch

Conflicts:
	popup.html
fixes to merge from master
got hovering icons working
got hovering working
started working on study modes
Merge branch 'darren_branch'

Conflicts:
	manifest.json
	popup.html
	popup.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/popup.js
Fixed merge conflicts
Basic storage now works

saving mood, health, name, kitty_mode, study_mode, timeout, total_time
updated initial icon to be icon_off.png