added javadoc to excersise 2
merge fix