Create 1242116.txt
変更しました
Merge branch 'master' of https://github.com/satoshimoriya/pmpractice

Conflicts:
	yabuki-a/index.php
	yabuki-a/nbproject/project.xml