Edited an existing method.
Merge branch 'master' of https://github.com/rick-js/justatest

Not sure how I got here. This is a merge from a git pull. Apparently when
the origin has changes that are not conflicts you have to merge. So,
let's find out how to merge. I think git is auto-merging the changes from
the origin, and git is just asking me to describe them...