Oauth is working and tokens stored
Merge remote-tracking branch 'github/master'