more correct particle-particle collisions

Updated particle-particle collisions to conserve momentum.  (And energy too -- they are now elastic between particles.  I'll have to add back inelasticity later).