idk what i did here
Merge branch 'dev' of https://github.com/zachtaylor/JPokemon into dev