application.yml and initializers
session controller and methods
merged conflicts
home controller and index
we r omniauthed
Merge pull request #10 from ianderse/oauth

Oauth