Deployed: Merge pull request #201 from masondesu/team-adds

generated from commit 8bd049d9bb6071e29884cb96c8526f8bf947a6b4