Fixed Ray->Segment logic. Still working on intersect.
Fixed merge conflicts.