Merge pull request #11 from suewhite/master

Twitter Search Works
routes
merge master
route conflict
Merge pull request #12 from suewhite/oauth

Oauth
Merge pull request #13 from Shadae/shadaerss

Updated Thread Design
Merge pull request #14 from suewhite/master

Creates Author Database
Merge pull request #15 from suewhite/twitter

merge conflict fixed
Add Tumblr gem
Merge branch 'master' into shadaerss
Social Media Icons