added google authentication
fixed google sign in layout
ran new migration
css minor
resolved google authenticate merge conflicts
Merge branch 'master' of github.com:emilysimonton/super_secret