Fixed conflicts
Start of adding oauth
Merge branch 'master' of github.com:bfosberry/GameSocial

Conflicts:
	Gemfile.lock
	db/schema.rb