Added scanline renderer for rasterizing triangles
Fixed merge conflict