Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
refactor per section 3 requirements
Merge branch 'section-3-refactor'
Merge branch 'master' into gh-pages