New commit message from yet another squash.
Merge branch 'master' of github.com:craftninja/git_practice into branchy-poo