modify the Circle draw function
modify the Elllipse draw function
add fillColor and strokeColor to Shape