05: Add a summary slide (what to use when)
Merge branch 'master' into gh-pages