adding cats
fixing merge conflict
Merge branch 'espears-master'