merlin is wonderful
dogs and cags saved together
Merge branch 'master' of https://github.com/mhoffman2/merlin