PetActivity
Merge branch 'master' of github.com:housemeow/TurtleDiary
fix dao bug and add GetTypes() method