Merging from students
Merging and correcting changes from student push