sync
Merge branch 'master' of https://github.com/hirumiran/first-git-miran
add conflict by hirumiran