Courses and profs oh my
Auto-merge of Marisol's changes