データ移行しました。
test追加しました。
テーマの作成
test+
Merge branch 'sagyou1' into mearge_test

Conflicts:
	README.md
	html/css/import/attachment.css
	html/css/import/common.css
	html/css/import/width.css
	html/css/pc.css
	html/js/heightLine.js
	html/js/menu.js
	html/js/smoothscroll.js
	license.txt
	wp-config-sample.php
	wp-config.php
	wp-content/plugins/wp-multibyte-patch/wpmp-config-sample-ja.php
	wp-content/themes/twentyfourteen/images/pattern-dark.svg
	wp-content/themes/twentyfourteen/images/pattern-light.svg
	wp-includes/images/crystal/license.txt
	wp-includes/js/jquery/jquery-migrate.js
	wp-includes/js/jquery/jquery-migrate.min.js