Updated slides and stuff.
Merge remote-tracking branch 'origin/master' into Tristan