git test

edit test.php from A
Merge branch 'master' of github.com:yamamotosa/test

Conflicts:
	test.php