Revert "Merge branch 'master' of https://github.com/wjshea1/webdev"

This reverts commit 6f98dab06e607f1ae83e995bc04b03f280152a8a, reversing
changes made to d261f521c7fc343d507165976ac537cc2190c12f.
Revert "Revert "Merge branch 'master' of https://github.com/wjshea1/webdev""

This reverts commit 3655fbfa3a963ccdf4162813ad3b0bac8b629a18.
Revert "Revert "Revert "Merge branch 'master' of https://github.com/wjshea1/webdev"""

This reverts commit c4d81fb2ba91f8d8d41f7c94087c3f7e78ac010b.