newのcss変更
headerの高さ変更
新規作成のとこ調整
Merge branch 'master' into fix_header

Conflicts:
	app/views/users/edit.html.erb
Merge branch 'fix_header'