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

Conflicts:
	mods/typeswap/learnsets.js