more fighting n stuff
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon

Conflicts:
	World.js