updated link, added title
manual merge

chose to use the gh-pages title in the conflict