Merge pull request #1 from nscrimshaw/master

Actual website
attempt 2
Merge pull request #2 from nscrimshaw/pages

Trial