Merge branch 'master' of https://github.com/ShintarouSuzuki/test

Conflicts:
.gitignore
コメント２行追加