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