Merge branch 'master' of github.com:TonyXie/TumblrTime

Conflicts:
	popup.js
last minute css fixes
Merge branch 'master' of github.com:TonyXie/TumblrTime

Conflicts:
	popup.js