creates author database
merge conflict
adds user_authors database
saves user_author relationships
Merge pull request #17 from suewhite/master

Created Relationship beetwen Users and Authors
Merge branch 'master' into twitter
author is saved in the db
Merge branch 'master' of github.com:suewhite/See-More into twitter
Merge pull request #21 from Shadae/shadaerss

Gemfile change with oauth Tumblr
merge conflicts fixed
my feed displays posts
Merge branch 'twitter' of github.com:suewhite/See-More into twitter
Merge pull request #22 from suewhite/twitter

Twitter databases to store posts
changed provider column in authors table to type
creates new class TwitterAuthor
Merge pull request #23 from suewhite/twitter

TwitterAuthor Class
adding tumblrauthor model
Merge branch 'master' into hhh
streamlining posts controller
Merge pull request #24 from suewhite/hhh

Hhh