Outline for what we at least need to give them as preparation material for lab 2
Merging 'master' into 'gh-pages'