local changes to MDD-Seminar.tex
resolved conflicts + update slides