General Psychology with Spotlights on Diversity