Merge pull request #4 from luwei0917/master

a
Update game.core.js
Update game.core.js
Update game.core.js
1st version
Merge remote-tracking branch 'remotes/origin/kitsune' into Wei_Lu
Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js
1st version
1st version
Merge remote-tracking branch 'origin/master' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js
Update game.core.js
1st version
Merge pull request #7 from luwei0917/Wei_Lu

Wei lu
Merge branch 'master' into kitsune

Conflicts:
	public/javascripts/game.core.js