added Cylinder class
fixed merge conflict