Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
スライドの実装が終わりました（仮テキストのみ）
画像の実装に必要なcssとjs
ダッシュボード周りのデザインを修正
コメントのアイコンを追加
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge branch 'develop' into feat/dashbord_design
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge branch 'develop' into feat/dashbord_design
faviconを追加
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge branch 'develop' into feat/dashbord_design
faviconを追加
写真アイコンをメニューに追加
写真のアイコンを追加
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/feat/dashbord_design' into develop

Conflicts:
	app/views/users/show.html.erb
Merge branch 'develop' into feat/dashboard-photo-comments
Removed unnecessary line
Merge pull request #68 from Tacahilo/feat/dashboard-photo-comments

Removed unnecessary line