FINAL VERSION - small bugfixes
Merge branch 'master' of https://github.com/JasonWoodruff/Team4DogShelter.git