final project
Merge pull request #242 from bkaufman/gh-pages

final project