JavaDOC, JML and verslag (class diagram)
Merge conflicts