Merge branches 'auth' and 'master' into auth
Merge branches 'auth' and 'master' into auth
gets auth token from tumblr
authentication, grabs photos from posts
starting from scratch