Merge conflict fixed

Code/OysterPhysics3D/RigidBody.cpp

@@ -70,11 +70,7 @@ void RigidBody::Update_LeapFrog( Float deltaTime )
 		this->box.center += deltaPos;
 	}
 
-<<<<<<< HEAD
-	// update movements and clear impulseForceSum and impulseTorqueSum
-=======
 	// update momentums and clear impulseForceSum and impulseTorqueSum
->>>>>>> origin/RigidBody
 	this->linearMomentum += linearImpulse;
 	this->impulseForceSum = Float3::null;
 	this->angularMomentum += angularImpulse;