Add root and conditional in Welcomes controller based on logged in status
Fix merge conflicts in User model
Change request_token to request_oauth_token / oauthd to complete_oauth
Change show to success in profile views
Change show method to success method and outhd call to complete_oauth call
Change hardcoded link to Rails link_to helper
Change /success to oauth/success and point it to #success instead of #show
Create fetch_unread_articles_from_pocket method that returns unread articles from Pocket
Call fetch_unread_articles_from_pocket on current_user upon oauth success
Merge pull request #15 from postmodem/master

Beginning to clean up naming in the Pocket OAuth authentication process