with auto sort on dealing
啊

啊
Merge branch 'kitsune'

Conflicts:
	.idea/workspace.xml
	public/javascripts/game.core.js
	public/javascripts/room1.js
a

aa
Merge branch 'master' of https://github.com/luwei0917/Tractor_RPI

Conflicts:
	.idea/workspace.xml
	public/javascripts/game.core.js
	public/javascripts/room1.js