I changed this commit message, too!
Merge branch 'master' of https://github.com/greglinch/gitworkshop