Merge pull request #47 from luwei0917/kitsune

Kitsune
4:50
Merge pull request #48 from luwei0917/master

maidubutton
5:03
Merge pull request #49 from luwei0917/Wei_Lu

receiveKitty
4/1/2014
4/1/2014
5:24
Merge pull request #50 from luwei0917/Wei_Lu

5:24
Merge pull request #51 from luwei0917/andy

4/1/2014
4/1/2014
7:32
Merge remote-tracking branch 'remotes/origin/master' into Wei_Lu

Conflicts:
	public/javascripts/game.core.js
new
Merge pull request #53 from luwei0917/Wei_Lu

Wei lu
8:17
Merge pull request #54 from luwei0917/Wei_Lu

8:17
Merge pull request #55 from luwei0917/master

4/14/2014
Merge remote-tracking branch 'origin/master'
4/14/2014