android project editing
Merge branch 'master' of https://github.com/sunxiaoyu/MyGame
git add ignore file