7行目を追加
Merge branch 'master' of github.com:booyan/git_test