modified
Merge branch 'master' of https://github.com/TakashiKanai/sample

Conflicts:
	info/hoge.php