MATH 316 Euclidean and Non-Euclidean Geometry