Merged file.
Completed merge.
Added a new test for the cats controller.