erge android
merg android
run game
merge confilict
Merge pull request #3 from yuye-liu/master

merge android