fix log in with oAuth and create account in one swoop
fix merge conflict in PID
Merge pull request #11 from RKim220/devise

fix log in with oAuth and create account in one swoop