1st version
1st version
Merge remote-tracking branch 'origin/master' into Wei_Lu

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

Wei lu