add some authorizations
add some tests
stopping point
add and clean up integration tests,
improve use of CanCan
merge master into feature branch
fix merge bug
minor edit
remove extra lines
Merge branch 'master' of https://github.com/epicodus/pet-finder