Alright, let's add some cats back
Merge branch 'master' into work

Conflicts:
	octocat.txt