Merge pull request #4 from luwei0917/master

a
Merge pull request #5 from luwei0917/master

zeng
1st version
Merge remote-tracking branch 'remotes/origin/kitsune' into Wei_Lu
Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js