quiz i appendix
Merge branch 'master' into mathilde