javadoc
Merge branch 'newBranch' of https://github.com/utwente-di/di05 into newBranch