derp
Merge branch 'master' of https://github.com/Xiaoming94/epicFoodWarGameProject
derp
Merge branch 'master' of https://github.com/Xiaoming94/epicFoodWarGameProject
fixed so you now can shoot right over network
merge conflict fix