Work on the google sign in
pull from master
Merge branch 'master' of https://github.com/claudey/gcdc
Implemented signup
merged files
merge fixes
merge fixes from jfunu's conflicts.