一旦コミット
UI
Merge branch 'feature/createSearch' into develop
commit
Merge branch 'feature/UIchange' into develop

Conflicts:
	app/Model/Blog.php
	app/View/Blogs/edit.ctp
	app/View/Blogs/index.ctp
	app/View/Search/index.ctp
いいかんじ
search機能編集
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop
blogs/view機能追加
htmlタグ統一
こみｔ
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop

Conflicts:
	app/View/Blogs/index.ctp
ログイン&新規登録のバリデーションを実装
Merge branch 'feature/sign_up' into develop
一旦コミット
Merge branch 'develop' into feature/createTagsController
HTML構造をリファクタリング

HTMLとSassを大幅に変更
一部修正
Merge branch 'feature/restructure_view' into develop
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop

Conflicts:
	app/View/Layouts/menu.ctp