integrate with google auth
Merge branch 'master' of https://github.com/suhan1021/3213Team12