balancing and minor fixes
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon

Conflicts:
	Fight.js
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon

Conflicts:
	game.js
Stockemon values updated
Merge branch 'master' of https://github.com/AnkeAnke/Stockemon