Added Object class, superclass of Sphere, Cube and Wall
resolved merge conflict