Removed unneeded cats
Merge branch 'octo-cat-revision'
Added more to the story
Merge branch 'octo-cat-revision'

Conflicts:
	octocat.txt
Changed Main ... added new method
Merge branch 'feature_x'