デザインを追加修正
Merge branch 'master' of https://github.com/wataruags/doremiru
Merge branch 'master' of https://github.com/wataruags/doremiru
Merge branch 'master' of https://github.com/wataruags/doremiru

Conflicts:
	themes/bootstrap/views/site/index.php
mysql連携確認