JavaDOC, JML and verslag (class diagram)
Merge conflicts
Unit tests added. Fixes #17.
Merge conflicts