part 6 and 8 done
Merge branch 'master' of https://github.com/lkbrun/ClassPresentation