yay
Merge branch 'master' of https://github.com/vasumv/pokemon_ai

Conflicts:
	runner.py
data