#15 add google oauth
Merge remote-tracking branch 'origin/master'