Sedimentation Of Circular And Elliptical Objects In A Two-Dimensional Foam