一旦戻す
Merge branch '戻る'

Conflicts:
	themes/wordpress-bootstrap-master 3/css/single.css
	themes/wordpress-bootstrap-master 3/css/style.css
	themes/wordpress-bootstrap-master 3/footer.php
	themes/wordpress-bootstrap-master 3/header.php
	themes/wordpress-bootstrap-master 3/single.php
	themes/wordpress-bootstrap-master 3/style.css
	themes/wordpress-bootstrap-master 3/ver1.1.0/css/style.css.orig
	themes/wordpress-bootstrap-master 3/ver1.1.0/index.html
	themes/wordpress-bootstrap-master 3/ver1.1.0/index.html.orig