The Foundations of Geometry and the Non-Euclidean Plane