translated a few
translated a few
translated a few
translated a few
revised
revised
revised
revised
revised
revised
revised
revised
revised
revised
revised
revised
revised
conflict resolved
Merge pull request #39 from soichi777/explore-conflict