doc
Merge branch 'master' of https://github.com/DavidRutqvist/d0010elab5grupp12.git
JavaDoc fix.