Add the slides page
Update slides
rename potentially conflicting files
Merge remote-tracking branch 'teacher/master'
Update to midterm