Suggest a much richer folder structure for the lab handin
Merging 'master' into 'gh-pages'