Teaching Computer Science With a Focus On Equity and Inclusion