function修正
test
Merge branch 'master' of github.com:yoshikazu-ogawa/base_wordpress

Conflicts:
	functions.php
t