Create 1242116.txt
変更しました
Merge pull request #1 from yuyasaito/master

Create 1242042.txt
fix conflicts
Merge branch 'master' of https://github.com/taroyabuki/pmpractice