newのcss変更
Merge branch 'master' into css

Conflicts:
	app/assets/stylesheets/users.css.scss
	app/views/users/new.html.erb
Merge branch 'css'