complete oauth
fixing conflicts
Merge pull request #2 from katiekatieb/omniauthgithub

complete oauth