Merge branch 'master' into gh-pages
Project 4 final
Merge branch 'gh-pages'