cat.txt added
octocat added
more text
octocat.txt mergefix