javadoc
Merge branch 'develop' of https://github.com/emmawestman/dat255group3 into develop