Revert "Merge branch 'master' of github.com:sjlbos/git-workshop-notes"

This reverts commit 7e01251de9b50d0cafa1cdab25636b39c258a241, reversing
changes made to d5467ed73878bca3e4b26ba1c9f96875501d4305.