functioning Ray Tracer
resolved conflicts