flask
Merge branches 'auth' and 'master' into auth
tumblr API
Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'auth' and 'master' into auth
gets auth token from tumblr