"This year, though, they were talking about the Trinity, the doctrine that God the Father, God the Son (that is, Jesus) and God the Holy Spirit together make up one God."

That's heresy!!  I hope that it was poor phrasing and not intentionally so.
God is not made up of three parts!