javadoc

kalo conflict, nt lewat netbeans di commit terus accept both