Merge branch 'master' of eevee@tekkanin.veekun.com:dev/pokedex
-rw-r--r-- 33 .gitignore
drwxr-xr-x - pokedex
-rw-r--r-- 314 setup.py