Add new text to the kitties text file
Merge conflict was resolved
Merge pull request #2 from mer8/mersbranch

Mersbranch