Modern geometry; an integrated first course