Fixed conflicts
Merge pull request #24 from bfosberry/games

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

Conflicts:
	Gemfile.lock
	db/schema.rb
Adter users migrate
Adding join between users and games