ヘッダーを少しいじったが、変更は特に無し
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
ダッシュボードデザインできた
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge branch 'develop' into feat/dashbord_design

Conflicts:
	app/views/users/show.html.erb
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Merge remote-tracking branch 'origin/feat/dashbord_design' into develop
Merged
Change css