Setup environment for Oauth

-Start creating algorithm for estimated time to finish reading
Merge branch 'master' of https://github.com/eddiekimosabe/7minutes.to

Conflicts:
	log/development.log
First implementation of Oauth

-Add code and access_token column to users table
Merge pull request #12 from eddiekimosabe/oauth

Oauth