Updated about 10 classes.
Merge branch 'artwork' of https://github.com/utwente-di/di10.git into artwork