Fix bug
Add pikachu circle
Merge branch 'master' of github.com:beckbaibai/pvt

Conflicts:
	client/game.client.js
Merge branch 'master' of github.com:beckbaibai/pvt