Title: On the Theory of Special and General Relativity