draw the ground by Pokemon types
update island
add Gyarados
Merge branch 'master' of https://github.com/nguoianphu/nguoianphu.github.com

Conflicts:
	pokepong/dist/js/game.min.js