test
right
Merge branch 'master' of github.com:noonnightstorm/FarmGame
del pro.android
test
push an avaliable version
add GameResource
resolve the conflict
test
add food and money