Incorporating Diversity in Everyday Teams