Working merge of Monday evening. Misses select of types and add fields.
Merge branch 'master' of https://github.com/Yamsolo/pokedex