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