testing links in intro
Merge branch 'master' into gh-pages