finished webpage
Merge pull request #10 from kshirley/gh-pages

Merge pull request #9 from kshirley/master
Merge pull request #11 from kshirley/master

Master