Merge pull request #1 from johndaniels/master

A start
More website stuff