7
Merge branch 'master' of github.com:irukasano/test

Conflicts:
	test.php