redid Pokemon::findByAttrs
Merge branch 'master' of github.com:tdegenko/CSC296Final