Fixing errors within team class https://app.asana.com/0/19128794071870/19632912981980
Merge remote-tracking branch 'origin/master'