update user
Merge branch 'master' of github.com:ernest21/bilden

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
	db/development.sqlite3
	log/development.log