tore out the ostream<< tostring hack
renamed 'object' to 'shape' since object kept on reminding me of java's
Object class
new (incomplete) classes added: Light, Triangle