style widget
Settings user
Merge branch 'style_Home'

Conflicts:
	app/controllers/users_controller.rb