test
Merge branch 'id/773/nanami' of https://github.com/nobuyuki0717/git_sample into id/773/nanami

Conflicts:
	test.php

nanamitakahiro
ii