mock site progress
Merge branch 'master' of https://github.com/troychroi/troychroi
Merge branch 'master' into gh-pages