Added gem 'omniauth-google-oauth2'

	modified:   Gemfile

Added a check in create to see if the user is logging in with google (Auth)
	modified:   app/controllers/session_controller.rb

Added methods to create or find users that are logging in with google
	modified:   app/models/user.rb

Added a link to log in using google
	modified:   app/views/users/_login.html.erb

Setup keys for omniauth (need to hide)
	new file:   config/initializers/omniauth.rb

Added match '/auth/google_oauth2/callback' => "session#create"
	modified:   config/routes.rb

Added a uid column and provider column for omniauth
new file:   db/migrate/20130608012223_add_columns_to_user_for_omni_auth.rb
Merge branch 'master' into take-3

Conflicts:
	Gemfile.lock
Added a session[:user_id] if you log in with google

	modified:   app/controllers/session_controller.rb