新しいアイコンを追加
uploading画面をつくった
Merge remote-tracking branch 'origin/feat/dashbord_design' into develop

Conflicts:
	app/assets/stylesheets/users.css.scss
	app/views/layouts/_header.html.erb
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop