trying to fix conflict merge when I wanted to pull most recent version
added links to about, index, services pages