story string
story string
random
Merge branch 'master' of https://github.com/TonyXie/TumblrTime

Conflicts:
	popup.js