Add logic to create or verify user from google, add ap gem, add sign in sign out links
Merge and resolve conflict