A merry-go-round is a common piece of playground equipment. A 2.8 m diameter merry-go-round with a mass of 250 kg is spinning at 24 rpm. John runs tangent to the merry-go-round at 5.0 m/s, in the same direction that it is turning, and jumps onto the outer edge. John's mass is 36 kg. What is the merry-go-round's angular velocity, in rpm, after John jumps on?