changes
Merge branch 'master' of https://github.com/Snaquaza/Tervari

Conflicts:
	mods/tervari/formats-data.js
	mods/tervari/learnsets.js
	mods/tervari/pokedex.js