Euclidean and Non-Euclidean Geometry