Add a cat pic
Rename a file
Add cat beard
Add monorail cat
Merge remote-tracking branch 'origin/feature1' into development
Resolve merge conflict
Add potted cats
Merge branch 'feature3' into development
Merge remote-tracking branch 'origin/feature2' into development
Merge branch 'development'