Adding a comment...
Merge branch 'master' of github.com:bendmorris/glasgow-version-control-stuff
Important information on Peter's cat.
Fixing conflicted information about cats.