ignore
del android
resolve coflict
Merge branch 'master' of https://github.com/w2moon/AnotherWorld
Merge branch 'master' of https://github.com/w2moon/AnotherWorld
make js folder