ファイル削除
Merge branch 'master' of https://github.com/ryuutarou/DMTC_Web_F

Conflicts:
	application/views/README-all-in-one.ja.txt
	application/views/my profile.html
	application/views/my profile.php
	application/views/profile.html
	application/views/profile_settei.php
	application/views/riyoukiyaku.html
	application/views/riyoukiyaku.php
	application/views/takunomi4.html
	application/views/takunomi4.php
	application/views/takunomi_confirm.php
	application/views/takunomi_login.php
	application/views/takunomi_pass.html
	application/views/takunomi_pass.php
	application/views/takunomi_shinki.php
	application/views/toppage.php