editページcss追加
indexのcss修正
Merge branch 'master' into css_users

Conflicts:
	app/views/users/edit.html.erb