Added evolutions to controller, updated find methods to Rails 4
Merge branch 'master' of github.com:mattybojo/pokedex