改行しました
Merge branch 'master' of https://github.com/shotaro041027/mydaho

Conflicts:
	functions.php