Update tristan.html
Update scott.html
Merge branch 'master' into gh-pages