Merge pull request #15 from suewhite/twitter

merge conflict fixed
Add Tumblr gem
Merge branch 'master' into shadaerss
Social Media Icons
Merge pull request #16 from Shadae/shadaerss

Shadaerss
Merge pull request #17 from suewhite/master

Created Relationship beetwen Users and Authors