update gitignore to ignore pictures uploaded for pets
update pet views
fix specs for pets pages
remove now untracked images
merge in add_email
fix merge bugs
Merge branch 'master' of https://github.com/epicodus/pet-finder