Added Nidoking to the pokedex
Merged with master in the sky