Added epipolar line calculation
Fixed merge conflict in camera model