merged
merged
moved collision handling; create momentum data members