Merge branch 'feature/contributing-info'
Merge branch 'feature/google-oauth'
Merge branch 'master' of github.com:freedomgames/parklab
Merge branch 'master' of github.com:freedomgames/parklab
Merge branch 'master' of github.com:freedomgames/parklab
fake insecure login whoo