Added JavaDocs comments for all classes. Fixed bug in mergeSpaceObjects() method where the combined mass of the two objects was being used as m1 in the conservation of linear momentum calculations. The mass of the calling object is no longer updated to totalMass until after the momentum calculations.