changed float->double in Shape, added Circle