Added some javadoc to uppgift 2