よくわかんない。。。
Merge branch 'master' of https://github.com/RyotaMinowa/makemiracle_true_dev

Conflicts:
	themes/wordpress-bootstrap-master 3/header.php.orig