Small edits to slides, added topics in outline
Small edits to preWorkshop instructions email
Fixed merge conflicts in slides.md