GetDogs and DeleteDogs changes...dog!
merge conflicts
Merge branch 'master' of github.com:COTB/k94warriors