Update game.core.js
Merge branch 'Wei_Lu'
Merge branch 'master' of https://github.com/luwei0917/Tractor-RPI-V2

Conflicts:
public/javascripts/game.core.js
jj

kk
Revert "jj"

This reverts commit 6da5ab26752623fc465616665dee5cfa3057dd18, reversing
changes made to 4d7e33f84b259dfefe898d31ab2b8a420e4a19b1.
Update game.core.js
fix

up
Update game.core.js
Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js
Revert "Merge branch 'Wei_Lu'"

This reverts commit 8ce3428364b6419e2cf72c883707cf9dfb2bb13a, reversing
changes made to 31470093bb20424d88814843dff1ff9a54e1d68a.
fix

up new
Update game.core.js
aa

sdf
Revert "aa"

This reverts commit f18fcedebc35858bd54861ceb9c4c1c5bea95a10, reversing
changes made to 53e2ec39d43ea000b0d9226ec3d0bd35d60cadcf.
real fix

up
Merge branch 'Wei_Lu'

Conflicts:
	public/javascripts/game.core.js
Revert "Merge branch 'Wei_Lu'"

This reverts commit 1cba8ff7709e11dbe5e6ad76faded07472d5f361, reversing
changes made to 52e9799037f73b20013f902e6b5bd6a566ccba90.
Real fix
Merge branch 'master' into Wei_Lu