popravio kontroler
Merge branch 'master' of https://github.com/Len0/nwt-op

Conflicts:
	app/controllers/users_controller.rb
ff