Completed Lab06 and updated javadoc