Add google sign-in button
merge fix