Working Google authentication
Merged everything I guess
Google authentication and merged other changes
fixed a lot of chris's methods