微調整
clean up
最初のコミット
Merge branch 'shinya' of https://github.com/jec-11jz/bridge

Conflicts:
	AddItem.html
	ComfirmPasswordSendMail.html
	ComfirmPasswordSetUp.html
	CreateDiary.html
	CreateUser.html
	DesignSetting.html
	ManagerDelete.html
	MyPageLeft.html
	NoticeSetting.html
	PasswordSetting.html
	RegisterAnimeProduct.html
	RegisterAnotherProduct.html
	RegisterComicProduct.html
	RegisterGameProduct.html
	RegisterMovieProduct.html
	RegisterMusicProduct.html
	RegisterNovelProduct.html
	SearchProduct.html
	Setting.html
	UserSetting.html最初のコミット
ファイル削除