template for team page
no changes
merged team page