change sample.txt
Merge branch 'master' of github.com:nakaearth/git_study2