Cat breeds
Merge branch 'master' of https://github.com/twlevelup/hashtag-trader-phoenix
Fix merge conflict
Fixed failing test