User modelling + wat andere dingen.
Merge branch 'master' of https://github.com/roelandoosterloo/TI3700