dkasm'dPhase 2

Conflicts:
	.gitignore
	googlep/.gitignore
	gtest/.gitignore
	gtest/app/models/user.rb
	gtest/app/views/home/show.html.erb
	gtest/app/views/layouts/application.html.erb
	gtest/app/views/sessions/create.html.erb
	gtest/config/initializers/omniauth.rb
	gtest/config/routes.rb
	gtest/db/migrate/20140625052250_create_users.rb
	gtest/db/schema.rb